MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Move library/markdown.php to src

Browse source
This commit is contained in:
Hypolite Petovan 2018-01-14 18:59:08 -05:00
commit fabbf810b0
6 changed files with 52 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/bb2diaspora.php
View file

@ -1,14 +1,12 @@
<?php
use Friendica\App;
use Friendica\Content\Text\Markdown;
use Friendica\Core\System;
use Friendica\Model\Contact;
use Friendica\Network\Probe;
use League\HTMLToMarkdown\HtmlConverter;
require_once 'include/event.php';
require_once 'library/markdown.php';
require_once 'include/html2bbcode.php';
require_once 'include/bbcode.php';
@ -58,7 +56,7 @@ function diaspora2bb($s) {
// Escaping the hash tags
$s = preg_replace('/\#([^\s\#])/', '&#35;$1', $s);
$s = Markdown($s);
$s = Markdown::convert($s);
$regexp = "/@\{(?:([^\}]+?); )?([^\} ]+)\}/";
$s = preg_replace_callback($regexp, 'diaspora_mention2bb', $s);