summaryrefslogtreecommitdiff
path: root/actions/avatar.php
diff options
context:
space:
mode:
Diffstat (limited to 'actions/avatar.php')
-rw-r--r--actions/avatar.php10
1 files changed, 9 insertions, 1 deletions
diff --git a/actions/avatar.php b/actions/avatar.php
index ffd003f74..720a02f6e 100644
--- a/actions/avatar.php
+++ b/actions/avatar.php
@@ -26,7 +26,15 @@ class AvatarAction extends SettingsAction {
function show_form($msg=NULL, $success=false) {
common_show_header(_t('Avatar'));
$this->settings_menu();
- $this->message($msg, $success);
+ 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. '));
+ }
$user = common_current_user();
$profile = $user->getProfile();