better titles in RSS

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

diff --git a/actions/avatar.php b/actions/avatar.php
index 720a02f6e65e84056a76606b573f1d58fabd96a3..61d7e770d3fffa33c6d48f371cd887dce34d6724 100644 (file)
--- a/actions/avatar.php
+++ b/actions/avatar.php
@@ -24,8 +24,7 @@ require_once(INSTALLDIR.'/lib/settingsaction.php');
 class AvatarAction extends SettingsAction {
 
        function show_form($msg=NULL, $success=false) {
-               common_show_header(_t('Avatar'));
-               $this->settings_menu();
+               common_show_header(_t('Avatar'), NULL, NULL, array($this, 'settings_menu'));
                if ($msg) {
                        $this->message($msg, $success);
                } else {
@@ -33,12 +32,15 @@ class AvatarAction extends SettingsAction {
                                                   _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. '));
+                                                         'Everything works best if your picture is more or less square. ' . 
+                                                         'And remember: your image will be released under the site license, ' .
+                                                         'So don\'t upload images that don\'t belong to you or that you don\'t ' .
+                                                         'want to share.'));
                }
 
                $user = common_current_user();
                $profile = $user->getProfile();
-               $original = $profile->getOriginal();
+               $original = $profile->getOriginalAvatar();
 
                if ($original) {
                        common_element('img', array('src' => $original->url,