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

diff --git a/actions/avatar.php b/actions/avatar.php
index 2d8a9f81d2..61d7e770d3 100644
--- 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 {
@@ -41,7 +40,7 @@ class AvatarAction extends SettingsAction {
 
 		$user = common_current_user();
 		$profile = $user->getProfile();
-		$original = $profile->getOriginal();
+		$original = $profile->getOriginalAvatar();
 
 		if ($original) {
 			common_element('img', array('src' => $original->url,