aboutsummaryrefslogtreecommitdiffstats
path: root/mod/dfrn_poll.php
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2012-03-19 09:34:39 +0100
committerzottel <github@zottel.net>2012-03-19 09:34:39 +0100
commit6d31e3d6ef56e22ecedccaeb6846b52da501097b (patch)
tree86518b59c0318d8057a1a8503c6354ebaa96dae3 /mod/dfrn_poll.php
parentdf78c9be0bab909dfa8cf196f7aaa4ea3423be8c (diff)
parent283bc51acf479eebd54145eb639c681980f6717b (diff)
downloadvolse-hubzilla-6d31e3d6ef56e22ecedccaeb6846b52da501097b.tar.gz
volse-hubzilla-6d31e3d6ef56e22ecedccaeb6846b52da501097b.tar.bz2
volse-hubzilla-6d31e3d6ef56e22ecedccaeb6846b52da501097b.zip
Merge remote branch 'upstream/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;