remove replybutton formatting

[quix0rs-gnu-social.git] / actions / avatar.php

diff --git a/actions/avatar.php b/actions/avatar.php
index 720a02f6e65e84056a76606b573f1d58fabd96a3..ac28d81704640f245165f261d17dc2a48a3fc4db 100644 (file)
--- a/actions/avatar.php
+++ b/actions/avatar.php
@@ -23,22 +23,22 @@ require_once(INSTALLDIR.'/lib/settingsaction.php');
 
 class AvatarAction extends SettingsAction {
 
+    function get_instructions() {
+               return _t('Upload a new "avatar" (user image) here. ' .
+                                 'You can\'t edit the picture after you upload it, so ' .
+                                 'make sure it\'s more or less square. ' .
+                                 'It must be under the site license, also. ' .
+                                 'Use a picture that belongs to you and that you ' .
+                                 'want to share.');
+       }
+
        function show_form($msg=NULL, $success=false) {
-               common_show_header(_t('Avatar'));
-               $this->settings_menu();
-               if ($msg) {
-                       $this->message($msg, $success);
-               } else {
-                       common_element('div', 'instructions', 
-                                                  _t('You can upload a new "avatar" (user picture) here. ' .
-                                                         'You can\'t edit the picture after you upload it, so you should ' .
-                                                         'edit it in your desktop image-manipulation software first. ' .
-                                                         'Everything works best if your picture is more or less square. '));
-               }
+
+               $this->form_header(_t('Avatar'), $msg, $success);
 
                $user = common_current_user();
                $profile = $user->getProfile();
-               $original = $profile->getOriginal();
+               $original = $profile->getOriginalAvatar();
 
                if ($original) {
                        common_element('img', array('src' => $original->url,
@@ -113,7 +113,7 @@ class AvatarAction extends SettingsAction {
 
                $user = common_current_user();
                $profile = $user->getProfile();
-               
+
                if ($profile->setOriginal($_FILES['avatarfile']['tmp_name'])) {
                        $this->show_form(_t('Avatar updated.'), true);
                } else {