class AvatarAction extends SettingsAction {
function show_form($msg=NULL, $success=false) {
- common_show_header(_t('Avatar'));
- $this->settings_menu();
- $this->message($msg, $success);
+ common_show_header(_t('Avatar'), NULL, NULL, array($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. ' .
+ '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,