more federation backend

2016-03-16 21:05:52 -07:00
parent 38eb79705e
commit 3a8f6e6576
2 changed files with 4 additions and 7 deletions
@@ -42,13 +42,8 @@ function get_salmon_key($uri,$keyhash) {
 	if(count($ret)) {
 		for($x = 0; $x < count($ret); $x ++) {
 			if(substr($ret[$x],0,5) === 'data:') {
-				if(strstr($ret[$x],','))
-					$ret[$x] = substr($ret[$x],strpos($ret[$x],',')+1);
-				else
-					$ret[$x] = substr($ret[$x],5);
+				$ret[$x] = convert_salmon_key($ret[$x]);
 			}
-			else
-				$ret[$x] = fetch_url($ret[$x]);
 		}
 	}