sforkowany z mirror/friendica
Merge pull request #8755 from MrPetovan/bug/notices
Replace mention to $_SERVER with parameter in Content\Markdown::convert2022.09-rc
commit
873f0b939f
|
@ -35,20 +35,20 @@ class Markdown
|
||||||
* compatibility with Diaspora in spite of the Markdown standard.
|
* compatibility with Diaspora in spite of the Markdown standard.
|
||||||
*
|
*
|
||||||
* @param string $text
|
* @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
|
* @return string
|
||||||
* @throws \Exception
|
|
||||||
*/
|
*/
|
||||||
public static function convert($text, $hardwrap = true) {
|
public static function convert($text, $hardwrap = true, $baseuri = null) {
|
||||||
$stamp1 = microtime(true);
|
$stamp1 = microtime(true);
|
||||||
|
|
||||||
$MarkdownParser = new MarkdownParser();
|
$MarkdownParser = new MarkdownParser();
|
||||||
$MarkdownParser->code_class_prefix = 'language-';
|
$MarkdownParser->code_class_prefix = 'language-';
|
||||||
$MarkdownParser->hard_wrap = $hardwrap;
|
$MarkdownParser->hard_wrap = $hardwrap;
|
||||||
$MarkdownParser->hashtag_protection = true;
|
$MarkdownParser->hashtag_protection = true;
|
||||||
$MarkdownParser->url_filter_func = function ($url) {
|
$MarkdownParser->url_filter_func = function ($url) use ($baseuri) {
|
||||||
if (strpos($url, '#') === 0) {
|
if (!empty($baseuri) && strpos($url, '#') === 0) {
|
||||||
$url = ltrim($_SERVER['REQUEST_URI'], '/') . $url;
|
$url = ltrim($baseuri, '/') . $url;
|
||||||
}
|
}
|
||||||
return $url;
|
return $url;
|
||||||
};
|
};
|
||||||
|
|
Ładowanie…
Reference in New Issue