Markdown is now supported in the location field as well.
This commit is contained in:
		
					parent
					
						
							
								e7e3857f5c
							
						
					
				
			
			
				commit
				
					
						044eaa778f
					
				
			
		
					 2 changed files with 2 additions and 2 deletions
				
			
		| 
						 | 
				
			
			@ -2161,7 +2161,7 @@ function diaspora_profile($importer,$xml,$msg) {
 | 
			
		|||
	$name = unxmlify($xml->first_name) . ((strlen($xml->last_name)) ? ' ' . unxmlify($xml->last_name) : '');
 | 
			
		||||
	$image_url = unxmlify($xml->image_url);
 | 
			
		||||
	$birthday = unxmlify($xml->birthday);
 | 
			
		||||
	$location = unxmlify($xml->location);
 | 
			
		||||
	$location = diaspora2bb(unxmlify($xml->location));
 | 
			
		||||
	$about = diaspora2bb(unxmlify($xml->bio));
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -94,7 +94,7 @@ function display_fetchauthor($a, $item) {
 | 
			
		|||
		normalise_link($profiledata["url"]), $item["uid"]);
 | 
			
		||||
	if (count($r)) {
 | 
			
		||||
		$profiledata["photo"] = proxy_url($r[0]["photo"]);
 | 
			
		||||
		$profiledata["address"] = $r[0]["location"];
 | 
			
		||||
		$profiledata["address"] = bbcode($r[0]["location"]);
 | 
			
		||||
		$profiledata["about"] = bbcode($r[0]["about"]);
 | 
			
		||||
		if ($r[0]["nick"] != "")
 | 
			
		||||
			$profiledata["nickname"] = $r[0]["nick"];
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue