X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Favatar.php;h=61d7e770d3fffa33c6d48f371cd887dce34d6724;hb=d0559fdf4dafcaf8446b437f4af089c944a23d09;hp=ffd003f749c4ba0cf4c592a0ec82ca2f1c0eb584;hpb=56021d95721c06b618dac6272e58d22a3e87037f;p=quix0rs-gnu-social.git

diff --git a/actions/avatar.php b/actions/avatar.php
index ffd003f749..61d7e770d3 100644
--- a/actions/avatar.php
+++ b/actions/avatar.php
@@ -24,13 +24,23 @@ 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();
-		$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,