Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x

1 files changed, 10 insertions, 0 deletions

diff --git a/actions/shownotice.php b/actions/shownotice.php
index c8e9cfe66..005335e3b 100644
--- a/actions/shownotice.php
+++ b/actions/shownotice.php
@@ -298,6 +298,16 @@ class ShownoticeAction extends OwnerDesignAction
                 array(),
                 array('format'=>'xml','url'=>$this->notice->uri)),
             'title'=>'oEmbed'),null);
+
+        // Extras to aid in sharing notices to Facebook
+        $avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE);
+        $avatarUrl = ($avatar) ?
+                     $avatar->displayUrl() :
+                     Avatar::defaultImage($avatar_size);
+        $this->element('meta', array('property' => 'og:image',
+                                     'content' => $avatarUrl));
+        $this->element('meta', array('property' => 'og:description',
+                                     'content' => $this->notice->content));
     }
 }