aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorMichael Meer <michael@meer.name>2014-01-22 13:38:47 +0100
committerMichael Meer <michael@meer.name>2014-01-22 13:38:47 +0100
commit6a1e73e610350bf3e19354e182803329f1234a8e (patch)
tree061e8671eab60b277288e4e1b2fddd83dcdcf058 /mod
parentffabb4cc867f59d86380eced3253053d368327f2 (diff)
parent39142002238b416a2d823245cf046ca9eee0bf94 (diff)
downloadvolse-hubzilla-6a1e73e610350bf3e19354e182803329f1234a8e.tar.gz
volse-hubzilla-6a1e73e610350bf3e19354e182803329f1234a8e.tar.bz2
volse-hubzilla-6a1e73e610350bf3e19354e182803329f1234a8e.zip
Merge branch 'master' of https://github.com/friendica/red
to keep the repros in sync
Diffstat (limited to 'mod')
-rw-r--r--mod/chanview.php12
1 files changed, 4 insertions, 8 deletions
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