X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fshowstream.php;h=fdf3d33bd46f2de5df6a323b3a6d92cea0f757e2;hb=fb437aabcaf9f6300c77079c93eba3f5a7f49f2f;hp=ee30c4416db3e7ee537ede9adb848289620a753d;hpb=0a60c577de82be067af03098ac47ce2de0f7b5bd;p=quix0rs-gnu-social.git

diff --git a/actions/showstream.php b/actions/showstream.php
index ee30c4416d..fdf3d33bd4 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -261,7 +261,7 @@ class ShowstreamAction extends StreamAction {
 
 		$notice->orderBy('created DESC');
 
-		$page = $this->arg('page') || 1;
+		$page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
 
 		$notice->limit((($page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1);
 
@@ -269,8 +269,6 @@ class ShowstreamAction extends StreamAction {
 
 		common_element_start('div', 'notices width66 floatLeft');
 
-		common_element_start('ul', 'bigLinks');
-
 		for ($i = 0; $i < min($cnt, NOTICES_PER_PAGE); $i++) {
 			if ($notice->fetch()) {
 				$this->show_notice($notice);
@@ -279,8 +277,6 @@ class ShowstreamAction extends StreamAction {
 				break;
 			}
 		}
-		
-		common_element_end('ul');
 
 		if ($page > 1) {
 			common_element_start('span', 'floatLeft width25');
@@ -318,8 +314,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, $notice));
+			common_element_end('span');
 		}
 
 		common_element_end('div');
@@ -328,15 +325,16 @@ class ShowstreamAction extends StreamAction {
 	function show_notice($notice) {
 		$profile = $notice->getProfile();
 		# XXX: RDFa
-		common_element_start('li', array('class' => 'notice',
-										 'id' => 'notice-' . $notice->id));
+		common_element_start('div', array('class' => 'notice',
+										  '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_end('li');
+		common_element_start('span', array('class' => 'content'));
+		common_raw(common_render_content($notice->content));
+		common_element_end('span');
+		common_element('a', array('class' => 'notice',
+								  'href' => $noticeurl),
+					   common_date_string($notice->created));
+		common_element_end('div');
 	}
 }