diff options
| author | Friendika <info@friendika.com> | 2011-09-04 00:48:45 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-09-04 00:48:45 -0700 |
| commit | 9ff1a3444e9029c94541a7c84f0ed5ba764adef3 (patch) | |
| tree | 67e131f721979a80268e947886514d8fbc9c1641 /include/bb2diaspora.php | |
| parent | 59a6a04e26bf6baec4b7ad62419e9d335db249df (diff) | |
| download | volse-hubzilla-9ff1a3444e9029c94541a7c84f0ed5ba764adef3.tar.gz volse-hubzilla-9ff1a3444e9029c94541a7c84f0ed5ba764adef3.tar.bz2 volse-hubzilla-9ff1a3444e9029c94541a7c84f0ed5ba764adef3.zip | |
add timezone convert module, several other minor or in progress fixes
Diffstat (limited to 'include/bb2diaspora.php')
| -rw-r--r-- | include/bb2diaspora.php | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index c779b6aaf..f9e3b3f28 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -62,9 +62,9 @@ function bb2diaspora($Text,$preserve_nl = false) { // [img]pathtoimage[/img] - $Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/", '[$1]($1)', $Text); - $Text = preg_replace("/\#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/", '[#$2]($1)', $Text); - $Text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/", '[$2]($1)', $Text); + $Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/ism", '[$1]($1)', $Text); + $Text = preg_replace("/\#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '[#$2]($1)', $Text); + $Text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '[$2]($1)', $Text); // $Text = preg_replace("/\[img\](.*?)\[\/img\]/", t('Image/photo: ') . '$1', $Text); // $Text = preg_replace("/\[img\](.*?)\[\/img\]/", t('image/photo'), $Text); @@ -165,7 +165,7 @@ function bb2diaspora($Text,$preserve_nl = false) { // oembed tag -// $Text = oembed_bbcode2html($Text); + // $Text = oembed_bbcode2html($Text); // If we found an event earlier, strip out all the event code and replace with a reformatted version. @@ -189,8 +189,6 @@ function bb2diaspora($Text,$preserve_nl = false) { function format_event_diaspora($ev) { -// require_once('include/bbcode.php'); - if(! ((is_array($ev)) && count($ev))) return ''; |