Skip to content
Snippets Groups Projects
Commit 97063ca1 authored by srosse's avatar srosse
Browse files

Merge OO 80-patch branch to OO default branch with 874b27e7707a803a8d51a7988f418e4e97760650

parents 9aba7845 93030105
No related branches found
No related tags found
No related merge requests found
...@@ -4,3 +4,4 @@ ...@@ -4,3 +4,4 @@
0000000000000000000000000000000000000000 OLAT-7.1.1 0000000000000000000000000000000000000000 OLAT-7.1.1
894c17abdf71ca1b21f1cf06cd700ba7c6c523a3 OpenOLAT 8.0 894c17abdf71ca1b21f1cf06cd700ba7c6c523a3 OpenOLAT 8.0
e141e6b0bb4fa449f18e8daf0a8501892787f0ac OpenOLAT 8.0.2 e141e6b0bb4fa449f18e8daf0a8501892787f0ac OpenOLAT 8.0.2
18a659f60a4d29c7f0a4232e66b9b51b87ee1bbe OpenOLAT 8.0.3
...@@ -31,6 +31,7 @@ import java.util.Iterator; ...@@ -31,6 +31,7 @@ import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.regex.Matcher;
import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringEscapeUtils;
import org.olat.core.logging.OLATRuntimeException; import org.olat.core.logging.OLATRuntimeException;
...@@ -497,7 +498,7 @@ public class QTIExportFormatterCSVType1 extends QTIExportFormatter { ...@@ -497,7 +498,7 @@ public class QTIExportFormatterCSVType1 extends QTIExportFormatter {
} }
private String escape(String s) { private String escape(String s) {
return s.replaceAll(emb, esc + emb); return s.replaceAll(emb, Matcher.quoteReplacement(esc) + emb);
} }
private void setDefaultQTIItemConfigs() { private void setDefaultQTIItemConfigs() {
......
...@@ -31,6 +31,7 @@ import java.util.Iterator; ...@@ -31,6 +31,7 @@ import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.regex.Matcher;
import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringEscapeUtils;
import org.olat.core.logging.OLATRuntimeException; import org.olat.core.logging.OLATRuntimeException;
...@@ -476,7 +477,7 @@ public class QTIExportFormatterCSVType2 extends QTIExportFormatter { ...@@ -476,7 +477,7 @@ public class QTIExportFormatterCSVType2 extends QTIExportFormatter {
} }
private String escape(String s) { private String escape(String s) {
return s.replaceAll(emb, esc + emb); return s.replaceAll(emb, Matcher.quoteReplacement(esc) + emb);
} }
private void setDefaultQTIItemConfigs() { private void setDefaultQTIItemConfigs() {
......
...@@ -31,6 +31,7 @@ import java.util.Iterator; ...@@ -31,6 +31,7 @@ import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.regex.Matcher;
import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringEscapeUtils;
import org.olat.core.logging.OLATRuntimeException; import org.olat.core.logging.OLATRuntimeException;
...@@ -395,7 +396,7 @@ public class QTIExportFormatterCSVType3 extends QTIExportFormatter{ ...@@ -395,7 +396,7 @@ public class QTIExportFormatterCSVType3 extends QTIExportFormatter{
} }
private String escape(String s){ private String escape(String s){
return s.replaceAll(emb, esc+emb); return s.replaceAll(emb, Matcher.quoteReplacement(esc)+emb);
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment