From fd8cea4761b5382f23d06ed52608d1f556c4dbe5 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Thu, 22 May 2014 17:31:30 -0400 Subject: [PATCH] Render GFM links using Markdown, not direct HTML --- src/main/java/com/gitblit/wicket/GitBlitWebApp.java | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.java b/src/main/java/com/gitblit/wicket/GitBlitWebApp.java index d3aa62f..7291d03 100644 --- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.java +++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.java @@ -25,6 +25,7 @@ import org.apache.wicket.Request; import org.apache.wicket.Response; import org.apache.wicket.Session; +import org.apache.wicket.application.IClassResolver; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.protocol.http.WebApplication; @@ -226,7 +227,8 @@ } // customize the Wicket class resolver to load from plugins - PluginClassResolver classResolver = new PluginClassResolver(pluginManager); + IClassResolver coreResolver = getApplicationSettings().getClassResolver(); + PluginClassResolver classResolver = new PluginClassResolver(coreResolver, pluginManager); getApplicationSettings().setClassResolver(classResolver); getMarkupSettings().setDefaultMarkupEncoding("UTF-8"); -- Gitblit v1.9.1