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

Merge OpenOLAT 11.2 to OpenOLAT default branch with 909ca91988467d54633a55191674f284eab95e69

parents 01750970 4dcf72e1
No related branches found
No related tags found
No related merge requests found
......@@ -616,14 +616,11 @@ public class AssessmentRenderFunctions {
</xsl:function>
*/
public static final String convertLink(AssessmentObjectComponent component, ResolvedAssessmentItem resolvedAssessmentItem, String uri) {
if(uri.startsWith("http:") || uri.startsWith("https:") || uri.startsWith("mailto:")) {
if(uri != null && uri.startsWith("http:") || uri.startsWith("https:") || uri.startsWith("mailto:")) {
return uri;
}
String relativePath = component.relativePathTo(resolvedAssessmentItem);
uri = component.getMapperUri() + "/file?href=" + relativePath + uri;
return uri;
return component.getMapperUri() + "/file?href=" + relativePath + (uri == null ? "" : uri);
}
}
}
\ No newline at end of file
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