aboutsummaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2012-06-02 07:46:27 -0700
committerCash Costello <cash.costello@gmail.com>2012-06-02 07:46:27 -0700
commitedb6a30963e704a102ba0032af98b5ccbb6bdbe4 (patch)
treef2bfb439444aa8906b84f3fa480415a27e1df5c6 /views
parent912bcd65be8fb4b12aef4b78e8e9fa5ad68fc412 (diff)
parentf848e3ada3e29c17cc5028d7d9edad8035706334 (diff)
downloadelgg-edb6a30963e704a102ba0032af98b5ccbb6bdbe4.tar.gz
elgg-edb6a30963e704a102ba0032af98b5ccbb6bdbe4.tar.bz2
Merge pull request #230 from sembrestels/avatar-revert1.8
Fixes #4396. Revert avatar also deletes avatar's files and crop coords now.
Diffstat (limited to 'views')
-rw-r--r--views/default/core/avatar/upload.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/views/default/core/avatar/upload.php b/views/default/core/avatar/upload.php
index 29aa59c9c..6f9124192 100644
--- a/views/default/core/avatar/upload.php
+++ b/views/default/core/avatar/upload.php
@@ -12,12 +12,12 @@ $user_avatar = elgg_view('output/img', array(
$current_label = elgg_echo('avatar:current');
-$revert_button = '';
+$remove_button = '';
if ($vars['entity']->icontime) {
- $revert_button = elgg_view('output/url', array(
- 'text' => elgg_echo('revert'),
- 'title' => elgg_echo('avatar:revert'),
- 'href' => 'action/avatar/revert?guid=' . elgg_get_page_owner_guid(),
+ $remove_button = elgg_view('output/url', array(
+ 'text' => elgg_echo('remove'),
+ 'title' => elgg_echo('avatar:remove'),
+ 'href' => 'action/avatar/remove?guid=' . elgg_get_page_owner_guid(),
'is_action' => true,
'class' => 'elgg-button elgg-button-cancel mll',
));
@@ -39,7 +39,7 @@ $image = <<<HTML
<label>$current_label</label><br />
$user_avatar
</div>
-$revert_button
+$remove_button
HTML;
$body = <<<HTML