Merge commit 'refs/merge-requests/41' of https://gitorious.org/social/mainline into...

[quix0rs-gnu-social.git] / lib / defaultprofileblock.php

diff --git a/lib/defaultprofileblock.php b/lib/defaultprofileblock.php
index a072b56f166ea1bc4767306d85064c87d1c061e6..8a7d9ef6cf9bfc39381c7dff31a1e92405ab0cb1 100644 (file)
--- a/lib/defaultprofileblock.php
+++ b/lib/defaultprofileblock.php
@@ -45,68 +45,34 @@ if (!defined('STATUSNET')) {
  * @link      http://status.net/
  */
 
-class DefaultProfileBlock extends ProfileBlock
+class DefaultProfileBlock extends AccountProfileBlock
 {
-    protected $profile = null;
-
     function __construct($out)
     {
-        parent::__construct($out);
         $user = common_current_user();
         if (empty($user)) {
             throw new Exception("DefaultProfileBlock with no user.");
         }
-        $this->profile = $user->getProfile();
-    }
-
-    function avatar()
-    {
-        $avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE);
-        if (empty($avatar)) {
-            $avatar = $this->profile->getAvatar(73);
-        }
-        return (!empty($avatar)) ? 
-            $avatar->displayUrl() : 
-            Avatar::defaultImage(AVATAR_PROFILE_SIZE);
-    }
-
-    function name()
-    {
-        return $this->profile->getBestName();
-    }
-
-    function url()
-    {
-        return $this->profile->profileurl;
-    }
-
-    function canEdit()
-    {
-        return true;
-    }
-
-    function editUrl()
-    {
-        return common_local_url('profilesettings');
-    }
-
-    function editText()
-    {
-        return _('Edit');
+        parent::__construct($out, $user->getProfile());
     }
 
     function location()
     {
-        return $this->profile->location;
+        return null;
     }
 
     function homepage()
     {
-        return $this->profile->homepage;
+        return null;
     }
 
     function description()
     {
-        return $this->profile->bio;
+        return null;
+    }
+
+    function otherProfiles()
+    {
+        return array();
     }
-}
\ No newline at end of file
+}