aboutsummaryrefslogtreecommitdiffstats
path: root/mod/dfrn_poll.php
diff options
context:
space:
mode:
authorTobias Diekershoff <tobias.diekershoff@gmx.net>2012-03-22 06:27:13 +0100
committerTobias Diekershoff <tobias.diekershoff@gmx.net>2012-03-22 06:27:13 +0100
commit5189a56ef832e1c5c6976f87d77d218bf4a6c221 (patch)
tree4c1aa63a36eeaadab00c61eb05f3f9f5ae0da095 /mod/dfrn_poll.php
parent751e4181e5e875b9f9850700a3687774e4c53ab3 (diff)
parentd81256d7b051d9a76b087feeb64ac79fb4aeff4d (diff)
downloadvolse-hubzilla-5189a56ef832e1c5c6976f87d77d218bf4a6c221.tar.gz
volse-hubzilla-5189a56ef832e1c5c6976f87d77d218bf4a6c221.tar.bz2
volse-hubzilla-5189a56ef832e1c5c6976f87d77d218bf4a6c221.zip
Merge branch 'master' of https://github.com/friendica/friendica
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;