+ Fixed an issue where the WorkflowEntry block would get stuck in a l…

…oop if it was passed a command value in the query string. (Fixes #2749)
SparkDevNetwork · Feb 9, 2018 · 5d066e2 · 5d066e2
1 parent 604d475
commit 5d066e2
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/RockWeb/Blocks/WorkFlow/WorkflowEntry.ascx.cs b/RockWeb/Blocks/WorkFlow/WorkflowEntry.ascx.cs
@@ -819,6 +819,11 @@ private void CompleteFormAction( string formAction )
                         {
                             var cb = CurrentPageReference;
                             cb.Parameters.AddOrReplace( "WorkflowId", _workflow.Id.ToString() );
+                            foreach ( var key in cb.QueryString.AllKeys.Where( k => !k.Equals( "Command", StringComparison.OrdinalIgnoreCase ) ) )
+                            {
+                                cb.Parameters.AddOrIgnore( key, cb.QueryString[key] );
+                            }
+                            cb.QueryString = new System.Collections.Specialized.NameValueCollection();
                             Response.Redirect( cb.BuildUrl(), false );
                             Context.ApplicationInstance.CompleteRequest();
                         }