aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/auth.php2
-rw-r--r--include/salmon.php4
2 files changed, 4 insertions, 2 deletions
diff --git a/include/auth.php b/include/auth.php
index 0a6050a17..05d5dfd6f 100644
--- a/include/auth.php
+++ b/include/auth.php
@@ -114,7 +114,7 @@ else {
// new account
$_SESSION['register'] = 1;
$openid->required = array('namePerson/friendly', 'contact/email', 'namePerson');
- $openid->optional = array('namePerson/first');
+ $openid->optional = array('namePerson/first','media/image/aspect11');
goaway($openid->authUrl());
// NOTREACHED
}
diff --git a/include/salmon.php b/include/salmon.php
index d998b2704..49384efea 100644
--- a/include/salmon.php
+++ b/include/salmon.php
@@ -182,7 +182,9 @@ EOT;
// check for success, e.g. 2xx
- if(($return_code >= 200) && ($return_code < 300)) {
+ if($return_code > 299) {
+
+ logger('slapper: compliant salmon failed. Falling back to status.net hack');
// Entirely likely that their salmon implementation is
// non-compliant. Let's try once more, this time only signing