friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Replace mention to $_SERVER with parameter in Content\Markdown::convert 

- $_SERVER key isn't always available, no idea what it was used for exactly
This commit is contained in:
Hypolite Petovan 2020-06-10 11:40:18 -04:00
parent 5f18d27b0b
commit db3f90ec01
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Content/Text/Markdown.php
View File

@ -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;
};