clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into develop

Browse Source 
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/diaspora.php
	object/Item.php
This commit is contained in:
Roland Häder
2016-12-22 11:29:56 +01:00
parent 41da37ae67 9e689e8b9b
commit c0df692f5f
16 changed files with 176 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mod/fetch.php
View File

@@ -52,12 +52,12 @@ function fetch_init(App &$a){
}
$user = $r[0];
$status = diaspora::build_status($item[0], $user);
$xml = diaspora::build_post_xml($status["type"], $status["message"]);
$status = Diaspora::build_status($item[0], $user);
$xml = Diaspora::build_post_xml($status["type"], $status["message"]);
// Send the envelope
header("Content-Type: application/magic-envelope+xml; charset=utf-8");
echo diaspora::build_magic_envelope($xml, $user);
echo Diaspora::build_magic_envelope($xml, $user);
killme();
}