Changeset 33897

Timestamp:

2020-02-04T10:06:11+13:00 (4 years ago)

Author:

kjdon

Message:

elsewhere in the code - GSXML.xmlSafe, we are escaping ' => ' we need to make sure we recover this too, otherwise get ' in the interface eg in search box if we have an apostrophe in search term.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/XMLConverter.java (modified) (2 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/XMLConverter.java

@@ -355 +355 @@
                 attr_val = attr_val.replaceAll(">",">");
                 attr_val = attr_val.replaceAll("\"",""");
+                
                 // assume that any of the above chars that was already entity escaped
                 // was already correct => return back to how they were
@@ -361 +362 @@
                 attr_val = attr_val.replaceAll(">",">");
                 attr_val = attr_val.replaceAll(""",""");
+                attr_val = attr_val.replaceAll("'","'");