diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-19 03:41:26 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-19 03:41:26 -0400 |
| commit | 236eaf6ed09df34e62cf487712d909cb8a3b35d1 (patch) | |
| tree | 86518b59c0318d8057a1a8503c6354ebaa96dae3 /mod/dfrn_poll.php | |
| parent | 5e2a9c99a64dc75dd70320859b093d132e823f1f (diff) | |
| parent | 283bc51acf479eebd54145eb639c681980f6717b (diff) | |
| download | volse-hubzilla-236eaf6ed09df34e62cf487712d909cb8a3b35d1.tar.gz volse-hubzilla-236eaf6ed09df34e62cf487712d909cb8a3b35d1.tar.bz2 volse-hubzilla-236eaf6ed09df34e62cf487712d909cb8a3b35d1.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
Existing photos could not be used as profile photos anymore - should be fixed now. And some extra logging in the CSRF-Protection to make debugging easier
community discovery cont., cleanup of DB debugging
* master:
Diffstat (limited to 'mod/dfrn_poll.php')
| -rwxr-xr-x | mod/dfrn_poll.php | 6 |
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; |