aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-05-19 17:36:11 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-05-19 17:36:11 -0700
commitc78869e437eecfe7e30f728c3726341b60fe7803 (patch)
treee5c0585d5093ffd270dde4cc15855bbbbab91a5b /include
parent77e2ef45f05b8106ebe5400f8931c6e54ec6341b (diff)
parente54198e5b8c0534a9021f4a494cf6fa504fc72ac (diff)
downloadvolse-hubzilla-c78869e437eecfe7e30f728c3726341b60fe7803.tar.gz
volse-hubzilla-c78869e437eecfe7e30f728c3726341b60fe7803.tar.bz2
volse-hubzilla-c78869e437eecfe7e30f728c3726341b60fe7803.zip
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts: view/nl/messages.po view/nl/strings.php
Diffstat (limited to 'include')
-rw-r--r--include/bbcode.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/bbcode.php b/include/bbcode.php
index 49dd4752d..260240a44 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -173,8 +173,9 @@ function bb_parse_app($match) {
function bb_parse_element($match) {
$j = json_decode(base64url_decode($match[1]),true);
+
if ($j) {
- $o = EOL . '<a href="#" onclick="importElement(\'' . $match[1] . '\'); return false;" >' . t('Install design element: ') . $j['pagetitle'] . '</a>' . EOL;
+ $o = EOL . '<a href="#" onclick="importElement(\'' . $match[1] . '\'); return false;" >' . t('Install ' . $j['type'] . ' element: ') . $j['pagetitle'] . '</a>' . EOL;
}
return $o;