diff options
| -rw-r--r-- | actions/shownotice.php | 5 | ||||
| -rw-r--r-- | actions/showstream.php | 18 | ||||
| -rw-r--r-- | lib/stream.php | 4 |
3 files changed, 16 insertions, 11 deletions
diff --git a/actions/shownotice.php b/actions/shownotice.php index 05c547301..b189fdb87 100644 --- 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 c66718cfe..2bd8439d1 100644 --- 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 4b7d6ed24..b6834eb45 100644 --- 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), |