From 2f81fb438508436ad6424c53f0f2dc878969b929 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 20 Aug 2012 06:34:54 -0700
Subject: upstream fixes

---
 include/bbcode.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'include/bbcode.php')

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) {
-- 
cgit v1.2.3