Merge branch 'master' of https://github.com/friendica/red

to keep the repros in sync

mod/chanview.php

@@ -78,14 +78,10 @@ function chanview_content(&$a) {
 		return;
 	}
 
-	if(is_foreigner($a->poi['xchan_hash']))
-		$url = $a->poi['xchan_url'];
-	else {
-		$url = (($observer) 
-			? z_root() . '/magic?f=&dest=' . $a->poi['xchan_url'] . '&addr=' . $a->poi['xchan_addr'] 
-			: $a->poi['xchan_url']
-		);
-	}
+
+	$url = $a->poi['xchan_url'];
+	if($observer)
+		$url = zid($url);
 
 	// let somebody over-ride the iframed viewport presentation
 

version.inc

@@ -1 +1 @@
-2014-01-21.564
+2014-01-22.565