Merge remote branch 'friendica/master' into blog-like
This commit is contained in:
		
				commit
				
					
						40f2ec189e
					
				
			
		
					 25 changed files with 501 additions and 340 deletions
				
			
		| 
						 | 
				
			
			@ -755,6 +755,8 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
 | 
			
		|||
		$item_result = $arr['output'];
 | 
			
		||||
		if($firstcollapsed) {
 | 
			
		||||
			$item_result['num_comments'] = sprintf( tt('%d comment','%d comments',$total_children),$total_children );
 | 
			
		||||
			$item_result['hidden_comments_num'] = $total_children;
 | 
			
		||||
			$item_result['hidden_comments_text'] = tt('comment', 'comments', $total_children);
 | 
			
		||||
			$item_result['hide_text'] = t('show more');
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue