diff options
author | redmatrix <redmatrix@redmatrix.me> | 2015-05-19 17:17:04 -0700 |
---|---|---|
committer | redmatrix <redmatrix@redmatrix.me> | 2015-05-19 17:17:04 -0700 |
commit | e54198e5b8c0534a9021f4a494cf6fa504fc72ac (patch) | |
tree | a8fca2cd5cf79fec2979a9386cd29ca511af679f /include | |
parent | d84c2835cd3a75a471ccd7c307e36421d8670064 (diff) | |
parent | 9485e917c61c244fac1ab5bb6fe760645e12dcfb (diff) | |
download | volse-hubzilla-e54198e5b8c0534a9021f4a494cf6fa504fc72ac.tar.gz volse-hubzilla-e54198e5b8c0534a9021f4a494cf6fa504fc72ac.tar.bz2 volse-hubzilla-e54198e5b8c0534a9021f4a494cf6fa504fc72ac.zip |
Merge https://github.com/redmatrix/redmatrix into pending_merge
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 4ff6f842e..c6d756cdd 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; |