aboutsummaryrefslogtreecommitdiffstats
path: root/mod/dfrn_poll.php
diff options
context:
space:
mode:
authorFabio Comuni <fabrix.xm@gmail.com>2012-03-19 12:24:40 +0100
committerFabio Comuni <fabrix.xm@gmail.com>2012-03-19 12:24:40 +0100
commitea4be0db89b5e95b50211e023e94aa008aadae46 (patch)
tree2d0654cae606cb3e543463e5569c2b2e689e45d6 /mod/dfrn_poll.php
parentc30342e2f7bde6fda899193f97ce3051cd8b2fdd (diff)
parent2349852b4abd1638624b541f173f51d1fb1ea011 (diff)
downloadvolse-hubzilla-ea4be0db89b5e95b50211e023e94aa008aadae46.tar.gz
volse-hubzilla-ea4be0db89b5e95b50211e023e94aa008aadae46.tar.bz2
volse-hubzilla-ea4be0db89b5e95b50211e023e94aa008aadae46.zip
Merge remote-tracking branch 'friendica/master'
Diffstat (limited to 'mod/dfrn_poll.php')
-rwxr-xr-xmod/dfrn_poll.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index b12e07132..fe5cd4906 100755
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -199,7 +199,7 @@ function dfrn_poll_post(&$a) {
$ptype = ((x($_POST,'type')) ? $_POST['type'] : '');
$dfrn_version = ((x($_POST,'dfrn_version')) ? (float) $_POST['dfrn_version'] : 2.0);
$perm = ((x($_POST,'perm')) ? $_POST['perm'] : 'r');
-
+
if($ptype === 'profile-check') {
if((strlen($challenge)) && (strlen($sec))) {
@@ -358,8 +358,8 @@ function dfrn_poll_post(&$a) {
intval($contact_id)
);
}
- }
-
+ }
+
header("Content-type: application/atom+xml");
$o = get_feed_for($a,$dfrn_id, $a->argv[1], $last_update, $direction);
echo $o;