From 39142002238b416a2d823245cf046ca9eee0bf94 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 22 Jan 2014 03:01:28 -0800
Subject: simplify chanview authentication and make sure it carries through
 multiple generations

---
 mod/chanview.php | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'mod/chanview.php')

diff --git a/mod/chanview.php b/mod/chanview.php
index ae22212b9..ca3410c8f 100644
--- a/mod/chanview.php
+++ b/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
 
-- 
cgit v1.2.3