harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #753 from zotlabs/mdauto

Browse Source 
markdown autolinks - hubzilla bug #752
This commit is contained in:
git-marijus 2017-05-05 12:33:39 +02:00 committed by GitHub
commit f08001a5a6
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Zotlabs/Lib/MarkdownSoap.php
View File

@ -77,15 +77,22 @@ class MarkdownSoap {
} }
function purify($s) { function purify($s) {
// $s = str_replace("\n",'<br>',$s); $s = $this->protect_autolinks($s);
// $s = str_replace("\t",'&nbsp;&nbsp;&nbsp;&nbsp;',$s);
// $s = str_replace(' ','&nbsp;',$s);
$s = purify_html($s); $s = purify_html($s);
// $s = str_replace(['&nbsp;', mb_convert_encoding('&#x00a0;','UTF-8','HTML-ENTITIES')], [ ' ', ' ' ],$s); $s = $this->unprotect_autolinks($s);
// $s = str_replace(['<br>','<br />', '&lt;', '&gt;' ],["\n","\n", '<', '>'],$s);
return $s; return $s;
} }
function protect_autolinks($s) {
$s = preg_replace('/\<(https?\:\/\/)(.*?)\>/','[$1$2]($1$2)',$s);
return $s;
}
function unprotect_autolinks($s) {
return $s;
}
function escape($s) { function escape($s) {
return htmlspecialchars($s,ENT_QUOTES); return htmlspecialchars($s,ENT_QUOTES);
} }