summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkondou <kondou@ts.unde.re>2013-08-26 17:41:19 +0200
committerkondou <kondou@ts.unde.re>2013-08-26 17:41:19 +0200
commite6473e6d49178f1c95036f56ef0a65589c0e5adb (patch)
tree5aad02bddd8bd1ff76f7a399c2f4994b7b85bcc8
parent31736a1df36745467ad176ee1ffe442b87546012 (diff)
downloadnextcloud-server-e6473e6d49178f1c95036f56ef0a65589c0e5adb.tar.gz
nextcloud-server-e6473e6d49178f1c95036f56ef0a65589c0e5adb.zip
Clean up some cruft
-rw-r--r--core/templates/layout.user.php2
-rw-r--r--lib/templatelayout.php5
-rw-r--r--settings/templates/personal.php3
-rw-r--r--settings/users.php1
4 files changed, 2 insertions, 9 deletions
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 0ab6a4dc08b..dfcfd544cfe 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -46,7 +46,7 @@
src="<?php print_unescaped(image_path('', 'logo-wide.svg')); ?>" alt="<?php p($theme->getName()); ?>" /></a>
<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
- <?php if (isset($_['avatar'])) { print_unescaped($_['avatar']); } ?>
+ <?php print_unescaped($_['avatar']); ?>
<ul id="settings" class="svg">
<span id="expand" tabindex="0" role="link">
diff --git a/lib/templatelayout.php b/lib/templatelayout.php
index 2e31b0395d5..b69d932c0a0 100644
--- a/lib/templatelayout.php
+++ b/lib/templatelayout.php
@@ -18,10 +18,7 @@ class OC_TemplateLayout extends OC_Template {
$this->assign('bodyid', 'body-user');
}
- // display avatars if they are enabled
- if (OC_Config::getValue('avatar') === 'gravatar' || OC_Config::getValue('avatar', 'local') === 'local') {
- $this->assign('avatar', '<img class="avatar" src="'.\OC_Helper::linkToRoute('core_avatar_get').'/'.OC_User::getUser().'/32">');
- }
+ $this->assign('avatar', '<img class="avatar" src="'.\OC_Helper::linkToRoute('core_avatar_get').'/'.OC_User::getUser().'/32">');
// Update notification
if(OC_Config::getValue('updatechecker', true) === true) {
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 1ea005cf335..9602414b668 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -74,9 +74,6 @@ if($_['passwordChangeSupported']) {
<input type="text" name="email" id="email" value="<?php p($_['email']); ?>"
placeholder="<?php p($l->t('Your email address'));?>" /><span class="msg"></span><br />
<em><?php p($l->t('Fill in an email address to enable password recovery'));?></em>
- <?php if($_['avatar'] === "gravatar") {
- print_unescaped($l->t('<br><em>Your Email will be used for your gravatar<em>'));
- } ?>
</fieldset>
</form>
<?php
diff --git a/settings/users.php b/settings/users.php
index 7dba45e1284..213d1eecfda 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -58,7 +58,6 @@ foreach($accessibleusers as $uid => $displayName) {
$users[] = array(
"name" => $uid,
- "avatar" => \OC_Avatar::get($uid, 32),
"displayName" => $displayName,
"groups" => OC_Group::getUserGroups($uid),
'quota' => $quota,