diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-05-19 17:36:11 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-05-19 17:36:11 -0700 |
| commit | c78869e437eecfe7e30f728c3726341b60fe7803 (patch) | |
| tree | e5c0585d5093ffd270dde4cc15855bbbbab91a5b /include | |
| parent | 77e2ef45f05b8106ebe5400f8931c6e54ec6341b (diff) | |
| parent | e54198e5b8c0534a9021f4a494cf6fa504fc72ac (diff) | |
| download | volse-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.php | 3 |
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; |