aboutsummaryrefslogtreecommitdiffstats
path: root/include/bbcode.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-08-20 06:34:54 -0700
committerfriendica <info@friendica.com>2012-08-20 06:34:54 -0700
commit2f81fb438508436ad6424c53f0f2dc878969b929 (patch)
treeb866c8a6b4c917af19c49c1067c1e5c1c1975f3c /include/bbcode.php
parent34e42c4cb34c78d9cb8ac48e9d80e58984346156 (diff)
downloadvolse-hubzilla-2f81fb438508436ad6424c53f0f2dc878969b929.tar.gz
volse-hubzilla-2f81fb438508436ad6424c53f0f2dc878969b929.tar.bz2
volse-hubzilla-2f81fb438508436ad6424c53f0f2dc878969b929.zip
upstream fixes
Diffstat (limited to 'include/bbcode.php')
-rw-r--r--include/bbcode.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/bbcode.php b/include/bbcode.php
index 0889e76ce..f43d2f547 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -324,6 +324,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
$Text = preg_replace("/\[crypt\](.*?)\[\/crypt\]/ism",'<br/><img src="' .$a->get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . t('Encrypted content') . '" /><br />', $Text);
+ $Text = preg_replace("/\[crypt=(.*?)\](.*?)\[\/crypt\]/ism",'<br/><img src="' .$a->get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . '$1' . ' ' . t('Encrypted content') . '" /><br />', $Text);
// Try to Oembed
if ($tryoembed) {