GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

use common_render_content

Browse Source 
darcs-hash:20080529164139-84dde-85f6b27707af4c2f00f0d62c2fe4e209ab353e57.gz
This commit is contained in:
Evan Prodromou 2008-05-29 12:41:39 -04:00
parent c3c32cac8d
commit 066f6843fe
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
actions/shownotice.php
View File

@ -68,8 +68,9 @@ class ShownoticeAction extends Action {
$profile->nickname), $profile->nickname),
$profile->nickname); $profile->nickname);
# FIXME: URL, image, video, audio # FIXME: URL, image, video, audio
common_element('span', array('class' => 'content'), common_element_start('span', array('class' => 'content'));
$notice->content); common_raw(common_render_content($notice->content));
common_element_end('span');
common_element('span', array('class' => 'date'), common_element('span', array('class' => 'date'),
common_date_string($notice->created)); common_date_string($notice->created));
common_element_end('div'); common_element_end('div');

18
actions/showstream.php
View File

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

4
lib/stream.php
View File

@ -47,7 +47,9 @@ class StreamAction extends Action {
'class' => 'nickname'), 'class' => 'nickname'),
$profile->nickname); $profile->nickname);
# FIXME: URL, image, video, audio # 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)); $noticeurl = common_local_url('shownotice', array('notice' => $notice->id));
common_element('a', array('class' => 'notice', common_element('a', array('class' => 'notice',
'href' => $noticeurl), 'href' => $noticeurl),