From c7a4aaddfc1c8b27c10e0d232967a6863974b34f Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 14 Apr 2011 11:47:55 -0400 Subject: [PATCH] show correct preview URL and hide delete button if avatar is not local --- actions/avatarsettings.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php index 7cc55e1e3f..ceab14a962 100644 --- a/actions/avatarsettings.php +++ b/actions/avatarsettings.php @@ -146,13 +146,15 @@ class AvatarsettingsAction extends SettingsAction // TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2). $this->element('h2', null, _("Preview")); $this->elementStart('div', array('id'=>'avatar_preview_view')); - $this->element('img', array('src' => $original->url, + $this->element('img', array('src' => $avatar->url, 'width' => AVATAR_PROFILE_SIZE, 'height' => AVATAR_PROFILE_SIZE, 'alt' => $user->nickname)); $this->elementEnd('div'); - // TRANS: Button on avatar upload page to delete current avatar. - $this->submit('delete', _m('BUTTON','Delete')); + if (!empty($avatar->filename)) { + // TRANS: Button on avatar upload page to delete current avatar. + $this->submit('delete', _m('BUTTON','Delete')); + } $this->elementEnd('li'); } -- 2.39.5