fix service discovery (I think)

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

diff --git a/lib/stream.php b/lib/stream.php
index d1d7ab1cd51ab399304cb96bb5f39b93ce6bbe9f..ac683367f166aec509ec9a7246dc8ad6a6d36b4c 100644 (file)
--- a/lib/stream.php
+++ b/lib/stream.php
@@ -27,16 +27,16 @@ class StreamAction extends Action {
                parent::handle($args);
        }
 
-       # XXX: for 'showstream' repeats same avatar over and over
        function show_notice($notice) {
+               global $config;
                $profile = $notice->getProfile();
                # XXX: RDFa
                common_element_start('div', array('class' => 'notice',
                                                                                  'id' => 'notice-' . $notice->id));
                $avatar = $profile->getAvatar(AVATAR_STREAM_SIZE);
                common_element_start('a', array('href' => $profile->profileurl));
-               common_element('img', array('src' => ($avatar) ? $avatar->url : DEFAULT_STREAM_AVATAR,
-                                                                       'class' => 'avatar stream floatLeft',
+               common_element('img', array('src' => ($avatar) ? $avatar->url : common_default_avatar(AVATAR_STREAM_SIZE),
+                                                                       'class' => 'avatar stream',
                                                                        'width' => AVATAR_STREAM_SIZE,
                                                                        'height' => AVATAR_STREAM_SIZE,
                                                                        'alt' =>
@@ -47,7 +47,9 @@ class StreamAction extends Action {
                                                                  'class' => 'nickname'),
                                           $profile->nickname);
                # FIXME: URL, image, video, audio
-               common_element('span', array('class' => 'content'), $notice->content);
+               common_element_start('span', array('class' => 'content'));
+               common_raw(common_render_content($notice->content, $notice));
+               common_element_end('span');
                $noticeurl = common_local_url('shownotice', array('notice' => $notice->id));
                common_element('a', array('class' => 'notice',
                                                                  'href' => $noticeurl),