Skip to content

Commit

Permalink
XWIKI-13915: $xwiki.getConfiguredSyntaxes() not equals to $services.r…
Browse files Browse the repository at this point in the history
…endering.getConfiguredSyntaxes()

 * Change implementation of legacy XWiki#getConfiguredSyntaxes to rely
   on ExtendedRenderingConfiguration#getConfiguredSyntaxes
  • Loading branch information
surli committed Mar 21, 2024
1 parent 3c1fb8c commit bfd13ba
Showing 1 changed file with 5 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.net.InetAddress;
import java.lang.reflect.Method;
import java.lang.reflect.InvocationTargetException;
Expand Down Expand Up @@ -1397,9 +1398,10 @@ public privileged aspect XWikiCompatibilityAspect
if (this.configuredSyntaxes == null) {
ExtendedRenderingConfiguration extendedRenderingConfiguration =
Utils.getComponent(ExtendedRenderingConfiguration.class);
String syntaxes = getConfiguration().getProperty("xwiki.rendering.syntaxes",
extendedRenderingConfiguration.getDefaultContentSyntax().toIdString());
this.configuredSyntaxes = Arrays.asList(StringUtils.split(syntaxes, " ,"));
this.configuredSyntaxes = extendedRenderingConfiguration.getConfiguredSyntaxes()
.stream()
.map(Syntax::toIdString)
.collect(Collectors.toList());
}
return this.configuredSyntaxes;
}
Expand Down

0 comments on commit bfd13ba

Please sign in to comment.