From 3db86041023cdadd7fb04465cd89ec03533f81e0 Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Fri, 8 Feb 2019 11:54:26 -0300 Subject: [PATCH] Add support for relative permalinks (#2555) --- app/components/markdown/markdown_link/markdown_link.js | 2 +- app/utils/url.js | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/app/components/markdown/markdown_link/markdown_link.js b/app/components/markdown/markdown_link/markdown_link.js index ad360d49e..8aae75fa1 100644 --- a/app/components/markdown/markdown_link/markdown_link.js +++ b/app/components/markdown/markdown_link/markdown_link.js @@ -40,7 +40,7 @@ export default class MarkdownLink extends PureComponent { return; } - const match = matchPermalink(url, serverURL) || matchPermalink(url, siteURL); + const match = matchPermalink(url, serverURL) || matchPermalink(url, siteURL) || matchPermalink(url, ''); if (match) { const teamName = match[1]; diff --git a/app/utils/url.js b/app/utils/url.js index 84c884edd..4881437db 100644 --- a/app/utils/url.js +++ b/app/utils/url.js @@ -97,10 +97,6 @@ export function getScheme(url) { } export function matchPermalink(link, rootURL) { - if (!rootURL) { - return null; - } - return new RegExp('^' + escapeRegex(rootURL) + '\\/([^\\/]+)\\/pl\\/(\\w+)').exec(link); }