Merge remote-tracking branch 'origin/master' into development

* origin/master: fix for error with mailto links
2017-01-23 23:27:06 +01:00 · 2017-01-23 23:27:06 +01:00 · 77541b6b09
parent f6237b7ddb 1a2d5c336b
commit 77541b6b09
1 changed files with 1 additions and 1 deletions
--- a/libs/ContentTypes/Markdown/LinkRenderer.php
+++ b/libs/ContentTypes/Markdown/LinkRenderer.php
@ -65,7 +65,7 @@ class LinkRenderer extends \League\CommonMark\Inline\Renderer\LinkRenderer

    protected function isExternalUrl($url)
    {
-        return preg_match('|^(?:[a-z]+:)?//|', $url);
+        return preg_match('|^(?:[a-z]+:)?//|', $url) || substr($url, 0, 7) == "mailto:";
    }

    /**