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

Merge pull request #2730 from annando/1608-missing-parameter-ping 

Bugfix: A parameter in xml::from_array was missing.
This commit is contained in:
Tobias Diekershoff 2016-08-11 08:52:18 +02:00 committed by GitHub
parent 103f70215a b6dec53ec1
commit 2b062214dc
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mod/ping.php
View File

@ -8,12 +8,14 @@ require_once('include/xml.php');
function ping_init(&$a) { function ping_init(&$a) {
$xmlhead = "<"."?xml version='1.0' encoding='UTF-8' ?".">";
if (local_user()){ if (local_user()){
// Different login session than the page that is calling us. // Different login session than the page that is calling us.
if (intval($_GET['uid']) && intval($_GET['uid']) != local_user()) { if (intval($_GET['uid']) && intval($_GET['uid']) != local_user()) {
$data = array("invalid" => 1); $data = array("invalid" => 1);
header("Content-type: text/xml"); header("Content-type: text/xml");
echo xml::from_array(array("result" => $data)); echo xml::from_array(array("result" => $data), $xml);
killme(); killme();
} }
@ -338,7 +340,7 @@ function ping_init(&$a) {
$data["sysmsgs"] = $sysmsg; $data["sysmsgs"] = $sysmsg;
header("Content-type: text/xml"); header("Content-type: text/xml");
echo xml::from_array(array("result" => $data)); echo xml::from_array(array("result" => $data), $xml);
killme(); killme();
} }