diff options
| author | Michael Meer <michael@meer.name> | 2014-01-22 13:38:47 +0100 |
|---|---|---|
| committer | Michael Meer <michael@meer.name> | 2014-01-22 13:38:47 +0100 |
| commit | 6a1e73e610350bf3e19354e182803329f1234a8e (patch) | |
| tree | 061e8671eab60b277288e4e1b2fddd83dcdcf058 | |
| parent | ffabb4cc867f59d86380eced3253053d368327f2 (diff) | |
| parent | 39142002238b416a2d823245cf046ca9eee0bf94 (diff) | |
| download | volse-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
| -rw-r--r-- | mod/chanview.php | 12 | ||||
| -rw-r--r-- | version.inc | 2 |
2 files changed, 5 insertions, 9 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 diff --git a/version.inc b/version.inc index 02e793fcd..a641cb0f8 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-01-21.564 +2014-01-22.565 |