aboutsummaryrefslogtreecommitdiffstats
path: root/include/bb2diaspora.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-01-25 15:16:43 -0800
committerfriendica <info@friendica.com>2012-01-25 15:16:43 -0800
commit10f768630ba5f77e9b7729df437690a767387319 (patch)
tree282a0420648f4e33e8bbf83ecaaa4b32ef21c9aa /include/bb2diaspora.php
parentd2a9341128efb4e2952acc3d59e7716471ffdee0 (diff)
downloadvolse-hubzilla-10f768630ba5f77e9b7729df437690a767387319.tar.gz
volse-hubzilla-10f768630ba5f77e9b7729df437690a767387319.tar.bz2
volse-hubzilla-10f768630ba5f77e9b7729df437690a767387319.zip
D* event formatting
Diffstat (limited to 'include/bb2diaspora.php')
-rwxr-xr-xinclude/bb2diaspora.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 8f17f2e36..ab124228d 100755
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -115,6 +115,7 @@ function bb2diaspora($Text,$preserve_nl = false) {
$Text = preg_replace("/\[img\](.*?)\[\/img\]/", '![' . t('image/photo') . '](' . '$1' . ')', $Text);
+ $Text = preg_replace("/\[img\=(.*?)\](.*?)\[\/img\]/", '![' . t('image/photo') . '](' . '$2' . ')', $Text);
// Perform MAIL Search
$Text = preg_replace("(\[mail\]([$MAILSearchString]*)\[/mail\])", '[$1](mailto:$1)', $Text);
@@ -241,7 +242,7 @@ function format_event_diaspora($ev) {
$bd_format = t('l F d, Y \@ g:i A') ; // Friday January 18, 2011 @ 8 AM
- $o = 'Friendika event notification:' . "\n";
+ $o = 'Friendica event notification:' . "\n";
$o .= '**' . bb2diaspora($ev['desc']) . '**' . "\n";