aboutsummaryrefslogtreecommitdiffstats
path: root/include/bbcode.php
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-05-30 15:04:11 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-05-30 15:04:11 -0700
commitcd3284d081bc86d0646234b490bc0cc9da60c638 (patch)
treedb7189c60b1bd4d8a484f491b736859086085564 /include/bbcode.php
parentedd228decb5ef4c3ffa2a8be00983937680a56c2 (diff)
parent504050618497d3f3f43bb44b89637ebd767557ce (diff)
downloadvolse-hubzilla-cd3284d081bc86d0646234b490bc0cc9da60c638.tar.gz
volse-hubzilla-cd3284d081bc86d0646234b490bc0cc9da60c638.tar.bz2
volse-hubzilla-cd3284d081bc86d0646234b490bc0cc9da60c638.zip
Merge https://github.com/redmatrix/redmatrix into pending_merge
Diffstat (limited to 'include/bbcode.php')
-rw-r--r--include/bbcode.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/bbcode.php b/include/bbcode.php
index 9ec5ce22f..f4d9bb525 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -193,6 +193,9 @@ function translate_design_element($type) {
case 'block':
$ret = t('block');
break;
+ case 'menu':
+ $ret = t('menu');
+ break;
}
return $ret;
@@ -958,4 +961,4 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true) {
function strip_bbimage($s) {
$Text = preg_replace("/\[[zi]mg(.*?)\](.*?)\[\/[zi]mg\]/ism", '', $Text);
-} \ No newline at end of file
+}