Merge remote branch 'upstream/master'
This commit is contained in:
		
				commit
				
					
						ea6ced8359
					
				
			
		
					 95 changed files with 38245 additions and 16296 deletions
				
			
		| 
						 | 
				
			
			@ -1192,7 +1192,7 @@ function tag_deliver($uid,$item_id) {
 | 
			
		|||
 | 
			
		||||
	// use a local photo if we have one
 | 
			
		||||
 | 
			
		||||
	$r = q("select thumb from contact where uid = %d and nurl = '%s' limit 1",
 | 
			
		||||
	$r = q("select * from contact where uid = %d and nurl = '%s' limit 1",
 | 
			
		||||
		intval($u[0]['uid']),
 | 
			
		||||
		dbesc(normalise_link($item['author-link']))
 | 
			
		||||
	);
 | 
			
		||||
| 
						 | 
				
			
			@ -1216,6 +1216,11 @@ function tag_deliver($uid,$item_id) {
 | 
			
		|||
		'otype'        => 'item'
 | 
			
		||||
	));
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
	$arr = array('item' => $item, 'user' => $u[0], 'contact' => $r[0]);
 | 
			
		||||
 | 
			
		||||
	call_hooks('tagged', $arr);
 | 
			
		||||
 | 
			
		||||
	if((! $community_page) && (! $prvgroup))
 | 
			
		||||
		return;
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue