diff options
| author | Friendika <info@friendika.com> | 2011-09-14 21:35:13 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-09-14 21:35:13 -0700 |
| commit | cdf2fe859f439a9d3689ea946e23d9aef1fb6cac (patch) | |
| tree | c0e0c744d122eb0e92ea4f7f4a9c9ce051cce2ed /include | |
| parent | 1778e4a315dd386911d12513d6aa7dc569782f13 (diff) | |
| download | volse-hubzilla-cdf2fe859f439a9d3689ea946e23d9aef1fb6cac.tar.gz volse-hubzilla-cdf2fe859f439a9d3689ea946e23d9aef1fb6cac.tar.bz2 volse-hubzilla-cdf2fe859f439a9d3689ea946e23d9aef1fb6cac.zip | |
don't escape underscore within links going to diaspora
Diffstat (limited to 'include')
| -rw-r--r-- | include/bb2diaspora.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index 591aaf7fa..5b240bdd2 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -42,6 +42,8 @@ function stripdcode_br_cb($s) { function bb2diaspora($Text,$preserve_nl = false) { + $ev = bbtoevent($Text); + // 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 @@ -52,7 +54,6 @@ function bb2diaspora($Text,$preserve_nl = false) { // After we're finished processing the bbcode we'll // replace all of the event code with a reformatted version. - $ev = bbtoevent($Text); if($preserve_nl) $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("/\<(.*?)(src|href)=(.*?)\&\;(.*?)\>/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); |