harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/redmatrix/redmatrix

Browse Source 
Conflicts:
	view/nl/messages.po
	view/nl/strings.php
This commit is contained in:
redmatrix
2015-05-19 17:36:11 -07:00
parent 77e2ef45f0 e54198e5b8
commit c78869e437
6 changed files with 80 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/bbcode.php
View File

@@ -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;