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

don't escape underscore within links going to diaspora

Browse source
This commit is contained in:
Friendika 2011-09-14 21:35:13 -07:00
parent 1778e4a315
commit cdf2fe859f
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/bb2diaspora.php
View file

@ -42,6 +42,8 @@ function stripdcode_br_cb($s) {
function bb2diaspora($Text,$preserve_nl = false) { function bb2diaspora($Text,$preserve_nl = false) {
$ev = bbtoevent($Text);
// Replace any html brackets with HTML Entities to prevent executing HTML or script // Replace any html brackets with HTML Entities to prevent executing HTML or script
// Don't use strip_tags here because it breaks [url] search by replacing & with amp // Don't use strip_tags here because it breaks [url] search by replacing & with amp
@ -52,7 +54,6 @@ function bb2diaspora($Text,$preserve_nl = false) {
// After we're finished processing the bbcode we'll // After we're finished processing the bbcode we'll
// replace all of the event code with a reformatted version. // replace all of the event code with a reformatted version.
$ev = bbtoevent($Text);
if($preserve_nl) if($preserve_nl)
$Text = str_replace(array("\n","\r"), array('',''),$Text); $Text = str_replace(array("\n","\r"), array('',''),$Text);
@ -185,7 +186,10 @@ function bb2diaspora($Text,$preserve_nl = false) {
$Text = preg_replace("/\[event\-adjust\](.*?)\[\/event\-adjust\]/is",'',$Text); $Text = preg_replace("/\[event\-adjust\](.*?)\[\/event\-adjust\]/is",'',$Text);
} }
$Text = preg_replace("/\<(.*?)(src|href)=(.*?)\&amp\;(.*?)\>/ism",'<$1$2=$3&$4>',$Text);
$Text = preg_replace('/\[(.*?)\\\\_(.*?)\]\((.*?)\)/ism','[$1_$2]($3)',$Text);
$Text = preg_replace('/\[(.*?)\\\\\*(.*?)\]\((.*?)\)/ism','[$1*$2]($3)',$Text);
call_hooks('bb2diaspora',$Text); call_hooks('bb2diaspora',$Text);