diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2012-04-05 17:25:47 -0700 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2012-04-05 17:25:47 -0700 |
| commit | 16484ccebc862403f4a6dd77770bd7f30f2b0225 (patch) | |
| tree | 87cbec848891e44100e8f2119701004740e993a9 /src/DotNetOpenAuth.OAuth2.Client/OAuth2/ChannelElements/OAuth2ClientChannel.cs | |
| parent | f8931a0317a30a74ab2341e1215138a6e8070bf3 (diff) | |
| parent | 2a67db4f550ecdb86e9adb05fb46b42650a375c0 (diff) | |
| download | DotNetOpenAuth-16484ccebc862403f4a6dd77770bd7f30f2b0225.zip DotNetOpenAuth-16484ccebc862403f4a6dd77770bd7f30f2b0225.tar.gz DotNetOpenAuth-16484ccebc862403f4a6dd77770bd7f30f2b0225.tar.bz2 | |
Merge branch 'v4.0'
Conflicts:
src/DotNetOpenAuth.OAuth2.Client/DotNetOpenAuth.OAuth2.Client.csproj
src/DotNetOpenAuth.OAuth2.ResourceServer/DotNetOpenAuth.OAuth2.ResourceServer.csproj
src/DotNetOpenAuth.OAuth2.ResourceServer/OAuth2/ResourceServer.cs
Diffstat (limited to 'src/DotNetOpenAuth.OAuth2.Client/OAuth2/ChannelElements/OAuth2ClientChannel.cs')
| -rw-r--r-- | src/DotNetOpenAuth.OAuth2.Client/OAuth2/ChannelElements/OAuth2ClientChannel.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/DotNetOpenAuth.OAuth2.Client/OAuth2/ChannelElements/OAuth2ClientChannel.cs b/src/DotNetOpenAuth.OAuth2.Client/OAuth2/ChannelElements/OAuth2ClientChannel.cs index 4f80a1e..54fc110 100644 --- a/src/DotNetOpenAuth.OAuth2.Client/OAuth2/ChannelElements/OAuth2ClientChannel.cs +++ b/src/DotNetOpenAuth.OAuth2.Client/OAuth2/ChannelElements/OAuth2ClientChannel.cs @@ -78,7 +78,7 @@ namespace DotNetOpenAuth.OAuth2.ChannelElements { } else if (response.ContentType.MediaType == HttpFormUrlEncoded || response.ContentType.MediaType == PlainTextEncoded) { return HttpUtility.ParseQueryString(body).ToDictionary(); } else { - throw ErrorUtilities.ThrowProtocol(OAuth2Strings.UnexpectedResponseContentType, response.ContentType.MediaType); + throw ErrorUtilities.ThrowProtocol(ClientStrings.UnexpectedResponseContentType, response.ContentType.MediaType); } } |