friendica/dir
6
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

When converting to HTML, hashtag addresses are now removed (only when the message is exported)

Browse source
This commit is contained in:
Michael Vogel 2013-05-15 22:20:06 +02:00
parent f7fbac2e2b
commit d4240a265b
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/bbcode.php
View file

@ -668,6 +668,12 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
// $Text = mb_convert_encoding($Text, "UTF-8", 'HTML-ENTITIES');
//}
// Remove all hashtag addresses
if (!$tryoembed) {
$pattern = '/#<a.*?href="(.*?)".*?>(.*?)<\/a>/is';
$Text = preg_replace($pattern, '#$2', $Text);
}
call_hooks('bbcode',$Text);
$a->save_timestamp($stamp1, "parser");

4
include/html2plain.php
View file

@ -107,6 +107,10 @@ function html2plain($html, $wraplength = 75, $compact = false)
$message = str_replace("\r", "", $html);
// replace all hashtag addresses
$pattern = '/#<a.*?href="(.*?)".*?>(.*?)<\/a>/is';
$message = preg_replace($pattern, '#$2', $message);
$doc = new DOMDocument();
$doc->preserveWhiteSpace = false;