harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
to keep the repros in sync
This commit is contained in:
Michael Meer 2014-01-22 13:38:47 +01:00
commit 6a1e73e610
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mod/chanview.php
View File

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

2
version.inc
View File

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