NEW - bug 289155: [patch] comment search broken with bugzilla 3.4

https://bugs.eclipse.org/bugs/show_bug.cgi?id=289155

4 files changed, 10 insertions, 3 deletions

diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java
index fe0203906..0a65bed00 100644
--- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java
+++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java
@@ -446,6 +446,13 @@ public class BugzillaClient {
 						if (nameValue.length == 1) {
 							pairs.add(new NameValuePair(nameValue[0].trim(), "")); //$NON-NLS-1$
 						} else if (nameValue.length == 2 && nameValue[0] != null && nameValue[1] != null) {
+
+							//Hack around bugzilla's change of attribute name for comment search field bug#289155
+							if (nameValue[0].startsWith("long_desc")) {
+								pairs.add(new NameValuePair(nameValue[0].replace("long_desc", "longdesc"),
+										URLDecoder.decode(nameValue[1].trim(), getCharacterEncoding())));
+							}
+
 							pairs.add(new NameValuePair(nameValue[0].trim(), URLDecoder.decode(nameValue[1].trim(),
 									getCharacterEncoding())));
 						}
diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryConnector.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryConnector.java
index af51989a6..9fff2fbc6 100644
--- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryConnector.java
+++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryConnector.java
@@ -62,7 +62,7 @@ public class BugzillaRepositoryConnector extends AbstractRepositoryConnector {
 
 	private static final String CHANGED_BUGS_CGI_QUERY = "/buglist.cgi?query_format=advanced&chfieldfrom="; //$NON-NLS-1$
 
-	private static final String CLIENT_LABEL = Messages.BugzillaRepositoryConnector_BUGZILLA_SUPPORTS_2_18_TO_3_0;
+	private static final String CLIENT_LABEL = Messages.BugzillaRepositoryConnector_BUGZILLA_CONNECTOR_LABEL;
 
 	private static final String COMMENT_FORMAT = "yyyy-MM-dd HH:mm"; //$NON-NLS-1$
 
diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/Messages.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/Messages.java
index 8b065b7a1..3eee036cb 100644
--- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/Messages.java
+++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/Messages.java
@@ -199,7 +199,7 @@ public class Messages extends NLS {
 
 	public static String BugzillaOperation_Reassign_to_default_assignee;
 
-	public static String BugzillaRepositoryConnector_BUGZILLA_SUPPORTS_2_18_TO_3_0;
+	public static String BugzillaRepositoryConnector_BUGZILLA_CONNECTOR_LABEL;
 
 	public static String BugzillaRepositoryConnector_Check_repository_configuration;
 
diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/messages.properties b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/messages.properties
index 6135d62b1..1972d9880 100644
--- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/messages.properties
+++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/messages.properties
@@ -97,7 +97,7 @@ BugzillaOperation_Reopen_bug=Reopen bug
 BugzillaOperation_Resolve_as=Resolve as
 BugzillaOperation_Reassign_to_default_assignee=Reassign to default assignee
 
-BugzillaRepositoryConnector_BUGZILLA_SUPPORTS_2_18_TO_3_0=Bugzilla (supports uncustomized 2.18-3.2)
+BugzillaRepositoryConnector_BUGZILLA_CONNECTOR_LABEL=Bugzilla (supports 3.0 and later)
 BugzillaRepositoryConnector_Check_repository_configuration=Check repository configuration: {0}
 BugzillaRepositoryConnector_checking_for_changed_tasks=Checking for changed tasks
 BugzillaRepositoryConnector_Query_for_changed_tasks=Query for changed tasks