From db3f90ec011202f2e611cc1a8155041a9879bd9e Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 10 Jun 2020 11:40:18 -0400 Subject: [PATCH] Replace mention to $_SERVER with parameter in Content\Markdown::convert - $_SERVER key isn't always available, no idea what it was used for exactly --- src/Content/Text/Markdown.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Content/Text/Markdown.php b/src/Content/Text/Markdown.php index 71437fb350..cfd83a38d8 100644 --- a/src/Content/Text/Markdown.php +++ b/src/Content/Text/Markdown.php @@ -35,20 +35,20 @@ class Markdown * compatibility with Diaspora in spite of the Markdown standard. * * @param string $text - * @param bool $hardwrap + * @param bool $hardwrap Enables line breaks on \n without two trailing spaces + * @param string $baseuri Optional. Prepend anchor links with this URL * @return string - * @throws \Exception */ - public static function convert($text, $hardwrap = true) { + public static function convert($text, $hardwrap = true, $baseuri = null) { $stamp1 = microtime(true); $MarkdownParser = new MarkdownParser(); $MarkdownParser->code_class_prefix = 'language-'; $MarkdownParser->hard_wrap = $hardwrap; $MarkdownParser->hashtag_protection = true; - $MarkdownParser->url_filter_func = function ($url) { - if (strpos($url, '#') === 0) { - $url = ltrim($_SERVER['REQUEST_URI'], '/') . $url; + $MarkdownParser->url_filter_func = function ($url) use ($baseuri) { + if (!empty($baseuri) && strpos($url, '#') === 0) { + $url = ltrim($baseuri, '/') . $url; } return $url; };