diff --git a/lib/core/common.py b/lib/core/common.py index f693730da..36944cb46 100644 --- a/lib/core/common.py +++ b/lib/core/common.py @@ -573,6 +573,7 @@ def restoreDumpMarkedChars(inpStr, onlyNewlineTab=False): if isinstance(replacedString, basestring): replacedString = replacedString.replace(DUMP_NEWLINE_MARKER, "\n").replace(DUMP_TAB_MARKER, "\t") + if not onlyNewlineTab: replacedString = replacedString.replace(DUMP_START_MARKER, "").replace(DUMP_STOP_MARKER, "") replacedString = replacedString.replace(DUMP_DEL_MARKER, ", ") diff --git a/lib/core/option.py b/lib/core/option.py index c162fefb3..0cb2fb9b0 100644 --- a/lib/core/option.py +++ b/lib/core/option.py @@ -199,6 +199,7 @@ def __loadQueries(): """ Loads queries from 'xml/queries.xml' file. """ + for node in xmlobject.XMLFile(path=paths.QUERIES_XML, textfilter=sanitizeStr).root.dbms: queries[node.value] = node