use common_render_content

darcs-hash:20080529164139-84dde-85f6b27707af4c2f00f0d62c2fe4e209ab353e57.gz

diff --git a/actions/shownotice.php b/actions/shownotice.php
index 05c547301585f3dd22fecae85a7827f8057988bc..b189fdb87fed43f629381c87563b687d466171ed 100644 (file)
--- a/actions/shownotice.php
+++ b/actions/shownotice.php
@@ -68,8 +68,9 @@ class ShownoticeAction extends Action {
                                                                  $profile->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));
+               common_element_end('span');
                common_element('span', array('class' => 'date'),
                                           common_date_string($notice->created));
                common_element_end('div');

diff --git a/actions/showstream.php b/actions/showstream.php
index c66718cfe86ea3e672491b3a68c80d06dcea91e1..2bd8439d1e33927120736d401b08305017c48482 100644 (file)
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -269,7 +269,7 @@ class ShowstreamAction extends StreamAction {
 
                common_element_start('div', 'notices width66 floatLeft');
 
-               common_element_start('ul', 'bigLinks');
+               common_element_start('ul', 'notices');
 
                for ($i = 0; $i < min($cnt, NOTICES_PER_PAGE); $i++) {
                        if ($notice->fetch()) {
@@ -318,8 +318,9 @@ class ShowstreamAction extends StreamAction {
 
                if ($notice->find(true)) {
                        # 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));
+                       common_element_end('span');
                }
 
                common_element_end('div');
@@ -332,11 +333,12 @@ class ShowstreamAction extends StreamAction {
                                                                                 'id' => 'notice-' . $notice->id));
                $noticeurl = common_local_url('shownotice', array('notice' => $notice->id));
                # FIXME: URL, image, video, audio
-               common_element_start('a', array('class' => 'notice',
-                                                                 'href' => $noticeurl));
-               common_element('span', 'title', common_date_string($notice->created));
-               common_element('span', 'desc', $notice->content);
-               common_element_end('a');
+               common_element('a', array('class' => 'notice',
+                                                                 'href' => $noticeurl),
+                                          common_date_string($notice->created));
+               common_element_start('span', array('class' => 'desc'));
+               common_raw(common_render_content($notice->content));
+               common_element_end('span');
                common_element_end('li');
        }
 }

diff --git a/lib/stream.php b/lib/stream.php
index 4b7d6ed24ec72ddd22582541e3566e4d7b8d36eb..b6834eb45ae8eef1654e440d737881f306ec667e 100644 (file)
--- a/lib/stream.php
+++ b/lib/stream.php
@@ -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));
+               common_element_end('span');
                $noticeurl = common_local_url('shownotice', array('notice' => $notice->id));
                common_element('a', array('class' => 'notice',
                                                                  'href' => $noticeurl),