diff options
| author | zottel <github@zottel.net> | 2012-03-31 00:30:34 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-03-31 00:30:34 +0200 |
| commit | f39e8126773e2a030cf84c8b9d428cc78546c1b9 (patch) | |
| tree | ec1318b325ec3dc5ab2bc4ded5dae1c657b8fc7b /include/auth.php | |
| parent | 2212e6931096d188be2dea27bcb4877f16c5c2f8 (diff) | |
| parent | aace55df0ad279d74c5e612078c3f29d114389dc (diff) | |
| download | volse-hubzilla-f39e8126773e2a030cf84c8b9d428cc78546c1b9.tar.gz volse-hubzilla-f39e8126773e2a030cf84c8b9d428cc78546c1b9.tar.bz2 volse-hubzilla-f39e8126773e2a030cf84c8b9d428cc78546c1b9.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/auth.php')
| -rwxr-xr-x | include/auth.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/auth.php b/include/auth.php index 835616a82..1341f3bb8 100755 --- a/include/auth.php +++ b/include/auth.php @@ -94,13 +94,17 @@ else { // Otherwise it's probably an openid. + try { require_once('library/openid.php'); $openid = new LightOpenID; $openid->identity = $openid_url; $_SESSION['openid'] = $openid_url; $a = get_app(); $openid->returnUrl = $a->get_baseurl(true) . '/openid'; - goaway($openid->authUrl()); + goaway($openid->authUrl()); + } catch (Exception $e) { + notice( t('We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.').'<br /><br >'. t('The error message was:').' '.$e->getMessage()); + } // NOTREACHED } } |