Merge branch 'master' of gitorious.org:social/mainline

[quix0rs-gnu-social.git] / classes / Profile.php

diff --git a/classes/Profile.php b/classes/Profile.php
index 94f83ab788a1ca388168d1bfb80dec1251c2ccb1..1af29b262090c11d94de624f6ad1feff7d073a73 100644 (file)
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -1324,6 +1324,7 @@ class Profile extends Managed_DataObject
             $object->id     = $this->getUri();
             $object->title  = $this->getBestName();
             $object->link   = $this->getUrl();
+            $object->summary = $this->getDescription();
 
             try {
                 $avatar = Avatar::getUploaded($this);
@@ -1390,6 +1391,11 @@ class Profile extends Managed_DataObject
         return $this->nickname;
     }
 
+    public function getDescription()
+    {
+        return $this->bio;
+    }
+
     /**
      * Returns the best URI for a profile. Plugins may override.
      *