diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2009-08-31 22:27:20 -0700 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2009-08-31 22:27:20 -0700 |
| commit | 22cd5b99d428271139aa0005d5b3462979cc2720 (patch) | |
| tree | 07826dae9e58ded2880a9e6bf656a46cb52e3505 /samples/OpenIdProviderMvc/Controllers/UserController.cs | |
| parent | 11fc039abf3c3902b3c697624111eb52448cb730 (diff) | |
| parent | 0488ebcfaef60e51bfcf7958b4a59d0ba5332a0f (diff) | |
| download | DotNetOpenAuth-22cd5b99d428271139aa0005d5b3462979cc2720.zip DotNetOpenAuth-22cd5b99d428271139aa0005d5b3462979cc2720.tar.gz DotNetOpenAuth-22cd5b99d428271139aa0005d5b3462979cc2720.tar.bz2 | |
Merge branch 'v3.1' into v3.2
Conflicts:
src/DotNetOpenAuth.Test/OpenId/AuthenticationTests.cs
src/DotNetOpenAuth.vsmdi
src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdRelyingParty.cs
Diffstat (limited to 'samples/OpenIdProviderMvc/Controllers/UserController.cs')
| -rw-r--r-- | samples/OpenIdProviderMvc/Controllers/UserController.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/samples/OpenIdProviderMvc/Controllers/UserController.cs b/samples/OpenIdProviderMvc/Controllers/UserController.cs index 3cb87ae..4fc2f9f 100644 --- a/samples/OpenIdProviderMvc/Controllers/UserController.cs +++ b/samples/OpenIdProviderMvc/Controllers/UserController.cs @@ -21,7 +21,7 @@ namespace OpenIdProviderMvc.Controllers { return redirect; } - if (Request.AcceptTypes.Contains("application/xrds+xml")) { + if (Request.AcceptTypes != null && Request.AcceptTypes.Contains("application/xrds+xml")) { return View("Xrds"); } |