forked from GNUsocial/gnu-social
		
	show the right stuff on profile page, too
darcs-hash:20080730033939-84dde-21b90f9c8b5fcede12a71f12fee20a4faaf1c549.gz
This commit is contained in:
		@@ -374,12 +374,8 @@ class ShowstreamAction extends StreamAction {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
	function show_notice($notice) {
 | 
						function show_notice($notice) {
 | 
				
			||||||
		$profile = $notice->getProfile();
 | 
							$profile = $notice->getProfile();
 | 
				
			||||||
		if (common_logged_in()) {
 | 
					 | 
				
			||||||
		$user = common_current_user();
 | 
							$user = common_current_user();
 | 
				
			||||||
			$user_profile = $user->getProfile();
 | 
					
 | 
				
			||||||
		} else {
 | 
					 | 
				
			||||||
			$user_profile = false;
 | 
					 | 
				
			||||||
		}
 | 
					 | 
				
			||||||
		# XXX: RDFa
 | 
							# XXX: RDFa
 | 
				
			||||||
		common_element_start('li', array('class' => 'notice_single',
 | 
							common_element_start('li', array('class' => 'notice_single',
 | 
				
			||||||
										 'id' => 'notice-' . $notice->id));
 | 
															 'id' => 'notice-' . $notice->id));
 | 
				
			||||||
@@ -420,13 +416,15 @@ class ShowstreamAction extends StreamAction {
 | 
				
			|||||||
								   'class' => 'replybutton'));
 | 
													   'class' => 'replybutton'));
 | 
				
			||||||
		common_raw('→');
 | 
							common_raw('→');
 | 
				
			||||||
		common_element_end('a');
 | 
							common_element_end('a');
 | 
				
			||||||
		common_element_end('p');
 | 
							if ($user && $notice->profile_id == $user->id) {
 | 
				
			||||||
		if ($user_profile && $notice->profile_id == $user_profile->id) {
 | 
					 | 
				
			||||||
			$deleteurl = common_local_url('deletenotice', array('notice' => $notice->id));
 | 
								$deleteurl = common_local_url('deletenotice', array('notice' => $notice->id));
 | 
				
			||||||
			common_element('a', array('class' => 'deletenotice',
 | 
								common_element_start('a', array('class' => 'deletenotice',
 | 
				
			||||||
									 'href' => $deleteurl),
 | 
																'href' => $deleteurl,
 | 
				
			||||||
									  _('delete'));
 | 
																'title' => _('delete')));
 | 
				
			||||||
 | 
								common_raw('×');
 | 
				
			||||||
 | 
								common_element_end('a');
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
 | 
							common_element_end('p');
 | 
				
			||||||
		common_element_end('li');
 | 
							common_element_end('li');
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
		Reference in New Issue
	
	Block a user