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

removing of hashtag addresses is now hidden behind a configuration

This commit is contained in:
Michael Vogel 2013-05-19 11:08:08 +02:00
parent 5ef6bdf88a
commit 0723933c1c
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/bbcode.php
View File

@ -673,7 +673,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
//} //}
// Remove all hashtag addresses // Remove all hashtag addresses
if (!$tryoembed) { if (!$tryoembed AND get_config("system", "remove_hashtags_on_export")) {
$pattern = '/#<a.*?href="(.*?)".*?>(.*?)<\/a>/is'; $pattern = '/#<a.*?href="(.*?)".*?>(.*?)<\/a>/is';
$Text = preg_replace($pattern, '#$2', $Text); $Text = preg_replace($pattern, '#$2', $Text);
} }
@ -684,4 +684,3 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
return $Text; return $Text;
} }

6
include/html2plain.php
View File

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