From 7fd84d7287f43aed81f831081432e58ef34efc6b Mon Sep 17 00:00:00 2001
From: jropella <jropella@gmail.com>
Date: Sun, 7 Jun 2015 16:18:18 -0400
Subject: [PATCH 1/2] Fix for queries with ampersands

---
 TechTalk.JiraRestClient/JiraClient.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TechTalk.JiraRestClient/JiraClient.cs b/TechTalk.JiraRestClient/JiraClient.cs
index b13346e..d2e0440 100644
--- a/TechTalk.JiraRestClient/JiraClient.cs
+++ b/TechTalk.JiraRestClient/JiraClient.cs
@@ -92,7 +92,7 @@ private IEnumerable<Issue<TIssueFields>> EnumerateIssuesInternal(String projectK
                 if (!String.IsNullOrEmpty(issueType))
                     jql += String.Format("+AND+issueType={0}", Uri.EscapeUriString(issueType));
                 if (!String.IsNullOrEmpty(jqlQuery))
-                    jql += String.Format("+AND+{0}", Uri.EscapeUriString(jqlQuery));
+                    jql += String.Format("+AND+{0}", Uri.EscapeUriString(jqlQuery).Replace("&", "%26");
                 var path = String.Format("search?jql={0}&startAt={1}&maxResults={2}", jql, resultCount, queryCount);
                 var request = CreateRequest(Method.GET, path);
 

From 7755d3d8472be6bebb1b66195c691053819d047d Mon Sep 17 00:00:00 2001
From: Justin Ropella <jropella@users.noreply.github.com>
Date: Tue, 6 Sep 2016 14:03:54 -0400
Subject: [PATCH 2/2] Fix typo

---
 TechTalk.JiraRestClient/JiraClient.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TechTalk.JiraRestClient/JiraClient.cs b/TechTalk.JiraRestClient/JiraClient.cs
index d2e0440..0bc34ec 100644
--- a/TechTalk.JiraRestClient/JiraClient.cs
+++ b/TechTalk.JiraRestClient/JiraClient.cs
@@ -92,7 +92,7 @@ private IEnumerable<Issue<TIssueFields>> EnumerateIssuesInternal(String projectK
                 if (!String.IsNullOrEmpty(issueType))
                     jql += String.Format("+AND+issueType={0}", Uri.EscapeUriString(issueType));
                 if (!String.IsNullOrEmpty(jqlQuery))
-                    jql += String.Format("+AND+{0}", Uri.EscapeUriString(jqlQuery).Replace("&", "%26");
+                    jql += String.Format("+AND+{0}", Uri.EscapeUriString(jqlQuery).Replace("&", "%26"));
                 var path = String.Format("search?jql={0}&startAt={1}&maxResults={2}", jql, resultCount, queryCount);
                 var request = CreateRequest(Method.GET, path);