Merge remote-tracking branch 'upstream/develop' into item-move
This commit is contained in:
		
				commit
				
					
						bd9cb4595d
					
				
			
		
					 1 changed files with 1 additions and 1 deletions
				
			
		| 
						 | 
				
			
			@ -1327,7 +1327,7 @@ class PortableContact
 | 
			
		|||
		}
 | 
			
		||||
 | 
			
		||||
		// Discover Friendica, Hubzilla and Diaspora servers
 | 
			
		||||
		$serverdata = fetch_url("http://the-federation.info/pods.json");
 | 
			
		||||
		$serverdata = Network::fetchUrl("http://the-federation.info/pods.json");
 | 
			
		||||
 | 
			
		||||
		if ($serverdata) {
 | 
			
		||||
			$servers = json_decode($serverdata);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue