diff options
author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-15 21:18:59 +0200 |
---|---|---|
committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-15 21:18:59 +0200 |
commit | ad82a56f79fa46fae0742d0647008025e32c3d2b (patch) | |
tree | 8b407c82b7e44761cfba105be1f10d17efcfaef7 /lib/base.php | |
parent | 4480b0b16409c9c2f3fcca34afbd5bd5d2d2a6e2 (diff) | |
parent | 339c98e5e69103806f03d1eac660f69d1583c5c2 (diff) | |
download | nextcloud-server-ad82a56f79fa46fae0742d0647008025e32c3d2b.tar.gz nextcloud-server-ad82a56f79fa46fae0742d0647008025e32c3d2b.zip |
Merge branch 'master' into appframework-master
Diffstat (limited to 'lib/base.php')
-rw-r--r-- | lib/base.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/base.php b/lib/base.php index 76779f66d16..05d151439a4 100644 --- a/lib/base.php +++ b/lib/base.php @@ -271,6 +271,14 @@ class OC { OC_Util::addScript('router'); OC_Util::addScript("oc-requesttoken"); + // avatars + if (\OC_Config::getValue('enable_avatars', true) === true) { + \OC_Util::addScript('placeholder'); + \OC_Util::addScript('3rdparty', 'md5/md5.min'); + \OC_Util::addScript('jquery.avatar'); + \OC_Util::addScript('avatar'); + } + OC_Util::addStyle("styles"); OC_Util::addStyle("apps"); OC_Util::addStyle("fixes"); |