summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndrew Arnott <andrewarnott@gmail.com>2010-04-11 20:22:04 -0700
committerAndrew Arnott <andrewarnott@gmail.com>2010-04-11 20:22:04 -0700
commitaf9ffb2d47e078acb3a1f2f845fd1924a37c4c3e (patch)
treefb4e8f6b282be117e9682d3b7e4df05a19151aaf /src
parent0853012a8002a0c4830f32ea5e5e8f5bf2325255 (diff)
downloadDotNetOpenAuth-af9ffb2d47e078acb3a1f2f845fd1924a37c4c3e.zip
DotNetOpenAuth-af9ffb2d47e078acb3a1f2f845fd1924a37c4c3e.tar.gz
DotNetOpenAuth-af9ffb2d47e078acb3a1f2f845fd1924a37c4c3e.tar.bz2
Marked Flatten as obsolete.
Diffstat (limited to 'src')
-rw-r--r--src/DotNetOpenAuth/Messaging/MessagingUtilities.cs5
-rw-r--r--src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdRelyingPartyAjaxControlBase.cs2
2 files changed, 5 insertions, 2 deletions
diff --git a/src/DotNetOpenAuth/Messaging/MessagingUtilities.cs b/src/DotNetOpenAuth/Messaging/MessagingUtilities.cs
index 7367c01..231637a 100644
--- a/src/DotNetOpenAuth/Messaging/MessagingUtilities.cs
+++ b/src/DotNetOpenAuth/Messaging/MessagingUtilities.cs
@@ -89,7 +89,7 @@ namespace DotNetOpenAuth.Messaging {
/// <summary>
/// Transforms an OutgoingWebResponse to an MVC-friendly ActionResult.
/// </summary>
- /// <param name="response">The response to send to the uesr agent.</param>
+ /// <param name="response">The response to send to the user agent.</param>
/// <returns>The <see cref="ActionResult"/> instance to be returned by the Controller's action method.</returns>
public static ActionResult AsActionResult(this OutgoingWebResponse response) {
Contract.Requires<ArgumentNullException>(response != null);
@@ -181,7 +181,10 @@ namespace DotNetOpenAuth.Messaging {
/// <typeparam name="T">The type of element contained in the sequence.</typeparam>
/// <param name="sequence">The sequence of sequences to flatten.</param>
/// <returns>A sequence of the contained items.</returns>
+ [Obsolete("Use Enumerable.SelectMany instead.")]
public static IEnumerable<T> Flatten<T>(this IEnumerable<IEnumerable<T>> sequence) {
+ ErrorUtilities.VerifyArgumentNotNull(sequence, "sequence");
+
foreach (IEnumerable<T> subsequence in sequence) {
foreach (T item in subsequence) {
yield return item;
diff --git a/src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdRelyingPartyAjaxControlBase.cs b/src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdRelyingPartyAjaxControlBase.cs
index 6cea42d..f22645f 100644
--- a/src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdRelyingPartyAjaxControlBase.cs
+++ b/src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdRelyingPartyAjaxControlBase.cs
@@ -321,7 +321,7 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
/// <param name="identifiers">The identifiers to perform discovery on.</param>
protected void PreloadDiscovery(IEnumerable<Identifier> identifiers) {
string script = this.AjaxRelyingParty.AsAjaxPreloadedDiscoveryResult(
- identifiers.Select(id => this.CreateRequests(id)).Flatten());
+ identifiers.SelectMany(id => this.CreateRequests(id)));
this.Page.ClientScript.RegisterClientScriptBlock(typeof(OpenIdRelyingPartyAjaxControlBase), this.ClientID, script, true);
}