fix service discovery (I think)

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

diff --git a/lib/stream.php b/lib/stream.php
index 2be55ffea4cbf2802e62da5a2642687c15ae384e..ac683367f166aec509ec9a7246dc8ad6a6d36b4c 100644 (file)
--- a/lib/stream.php
+++ b/lib/stream.php
@@ -34,28 +34,26 @@ class StreamAction extends Action {
                common_element_start('div', array('class' => 'notice',
                                                                                  'id' => 'notice-' . $notice->id));
                $avatar = $profile->getAvatar(AVATAR_STREAM_SIZE);
-               common_element_start('span', 'floatLeft width10');
                common_element_start('a', array('href' => $profile->profileurl));
                common_element('img', array('src' => ($avatar) ? $avatar->url : common_default_avatar(AVATAR_STREAM_SIZE),
-                                                                       'class' => 'avatar stream floatLeft',
+                                                                       'class' => 'avatar stream',
                                                                        'width' => AVATAR_STREAM_SIZE,
                                                                        'height' => AVATAR_STREAM_SIZE,
                                                                        'alt' =>
                                                                        ($profile->fullname) ? $profile->fullname :
                                                                        $profile->nickname));
                common_element_end('a');
-               common_element_end('span');
-               common_element_start('span', 'floatRight width90');
                common_element('a', array('href' => $profile->profileurl,
                                                                  '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),
                                           common_date_string($notice->created));
-               common_element_end('span');
                common_element_end('div');
        }
 }