From c1a1b2ab60b9c19d49580869a0835b0be6f0eb0d Mon Sep 17 00:00:00 2001 From: Friendika Date: Tue, 23 Aug 2011 01:33:58 -0700 Subject: [PATCH] updates bb2md --- include/bb2diaspora.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index a4e7997f..007a2bf3 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -32,6 +32,8 @@ function bb2diaspora($Text,$preserve_nl = false) { // Perform URL Search + // [img]pathtoimage[/img] + $Text = preg_replace("/\[img\](.*?)\[\/img\]/", t('Image/photo: ') . '$1', $Text); $Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/", '[$1]($1)', $Text); @@ -43,6 +45,11 @@ function bb2diaspora($Text,$preserve_nl = false) { $Text = preg_replace("(\[mail\]([$MAILSearchString]*)\[/mail\])", '[$1](mailto:$1)', $Text); $Text = preg_replace("/\[mail\=([$MAILSearchString]*)\](.*?)\[\/mail\]/", '[$2](mailto:$1)', $Text); + $Text = str_replace('*', '\\*', $Text); + $Text = str_replace('_', '\\_', $Text); + + $Text = str_replace('`','\\`', $Text); + // Check for bold text $Text = preg_replace("(\[b\](.*?)\[\/b\])is",'**$1**',$Text); @@ -92,7 +99,7 @@ function bb2diaspora($Text,$preserve_nl = false) { // $CodeLayout = '$1'; // Check for [code] text -// $Text = preg_replace("/\[code\](.*?)\[\/code\]/is","$CodeLayout", $Text); + $Text = preg_replace("/\[code\](.*?)\[\/code\]/is","```$1```", $Text); @@ -103,8 +110,6 @@ function bb2diaspora($Text,$preserve_nl = false) { // $Text = preg_replace("/\[quote\](.*?)\[\/quote\]/is","$QuoteLayout", $Text); // Images - // [img]pathtoimage[/img] -// $Text = preg_replace("/\[img\](.*?)\[\/img\]/", '' . t('Image/photo') . '', $Text); // html5 video and audio