Merge release 1.6.0

1 files changed, 7 insertions, 4 deletions

diff --git a/src/main/java/com/gitblit/wicket/MarkupProcessor.java b/src/main/java/com/gitblit/wicket/MarkupProcessor.java
index ff6fbce2..e7681f2c 100644
--- a/src/main/java/com/gitblit/wicket/MarkupProcessor.java
+++ b/src/main/java/com/gitblit/wicket/MarkupProcessor.java
@@ -56,11 +56,11 @@ import org.slf4j.LoggerFactory;
 import com.gitblit.IStoredSettings;

 import com.gitblit.Keys;

 import com.gitblit.models.PathModel;

+import com.gitblit.servlet.RawServlet;

 import com.gitblit.utils.JGitUtils;

 import com.gitblit.utils.MarkdownUtils;

 import com.gitblit.utils.StringUtils;

 import com.gitblit.wicket.pages.DocPage;

-import com.gitblit.wicket.pages.RawPage;

 import com.google.common.base.Joiner;

 

 /**

@@ -260,7 +260,8 @@ public class MarkupProcessor {
 				if (imagePath.indexOf("://") == -1) {

 					// relative image

 					String path = doc.getRelativePath(imagePath);

-					url = getWicketUrl(RawPage.class, repositoryName, commitId, path);

+					String contextUrl = RequestCycle.get().getRequest().getRelativePathPrefixToContextRoot();

+					url = RawServlet.asLink(contextUrl, repositoryName, commitId, path);

 				} else {

 					// absolute image

 					url = imagePath;

@@ -312,7 +313,8 @@ public class MarkupProcessor {
 				if (node.url.indexOf("://") == -1) {

 					// repository-relative image link

 					String path = doc.getRelativePath(node.url);

-					String url = getWicketUrl(RawPage.class, repositoryName, commitId, path);

+					String contextUrl = RequestCycle.get().getRequest().getRelativePathPrefixToContextRoot();

+					String url = RawServlet.asLink(contextUrl, repositoryName, commitId, path);

 					return new Rendering(url, text);

 				}

 				// absolute image link

@@ -325,7 +327,8 @@ public class MarkupProcessor {
 				if (url.indexOf("://") == -1) {

 					// repository-relative image link

 					String path = doc.getRelativePath(url);

-					String wurl = getWicketUrl(RawPage.class, repositoryName, commitId, path);

+					String contextUrl = RequestCycle.get().getRequest().getRelativePathPrefixToContextRoot();

+					String wurl = RawServlet.asLink(contextUrl, repositoryName, commitId, path);

 					rendering = new Rendering(wurl, alt);

 				} else {

 					// absolute image link