forked from GNUsocial/gnu-social
		
	reply_to is now stored on the notice, not on the reply record
darcs-hash:20080709202346-84dde-63561db24b55e98020c00707cc2c36e46bb8025f.gz
This commit is contained in:
		| @@ -95,7 +95,7 @@ class RepliesAction extends StreamAction { | ||||
| 					if (!$result) { | ||||
| 						continue; | ||||
| 					} | ||||
| 					$this->show_notice($notice, $reply->replied_id); | ||||
| 					$this->show_notice($notice); | ||||
| 				} else { | ||||
| 					// shouldn't happen! | ||||
| 					break; | ||||
|   | ||||
| @@ -57,7 +57,7 @@ class StreamAction extends Action { | ||||
| 		common_element_end('ul'); | ||||
| 	} | ||||
|  | ||||
| 	function show_notice($notice, $replied_id=NULL) { | ||||
| 	function show_notice($notice) { | ||||
| 		global $config; | ||||
| 		$profile = $notice->getProfile(); | ||||
| 		# XXX: RDFa | ||||
| @@ -93,12 +93,12 @@ class StreamAction extends Action { | ||||
| 								  'href' => $noticeurl, | ||||
| 								  'title' => common_exact_date($notice->created)), | ||||
| 					   common_date_string($notice->created)); | ||||
| 		if ($replied_id) { | ||||
| 			$replyurl = common_local_url('shownotice', array('notice' => $replied_id)); | ||||
| 			common_text('('); | ||||
| 		if ($notice->reply_to) { | ||||
| 			$replyurl = common_local_url('shownotice', array('notice' => $notice->reply_to)); | ||||
| 			common_text(' ('); | ||||
| 			common_element('a', array('class' => 'inreplyto', | ||||
| 									  'href' => $replyurl), | ||||
| 						   _t(' in reply to...')); | ||||
| 						   _t('in reply to...')); | ||||
| 			common_text(')'); | ||||
| 		} | ||||
| 		common_element_start('a',  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user