diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-05-31 19:26:00 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-05-31 19:26:00 -0700 |
| commit | f3b95f591a7ec49b6fc148913861bae2bb6aa6c7 (patch) | |
| tree | 22f9f085950ac16766ed3af1f1d052d233c0660e /include/bbcode.php | |
| parent | 8fe3daab21f9aba00f7def3553247b0cbcf5f94a (diff) | |
| parent | 5cc5e0fafdbc1795781b52124a63695ce3e2d49f (diff) | |
| download | volse-hubzilla-f3b95f591a7ec49b6fc148913861bae2bb6aa6c7.tar.gz volse-hubzilla-f3b95f591a7ec49b6fc148913861bae2bb6aa6c7.tar.bz2 volse-hubzilla-f3b95f591a7ec49b6fc148913861bae2bb6aa6c7.zip | |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Diffstat (limited to 'include/bbcode.php')
| -rw-r--r-- | include/bbcode.php | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/include/bbcode.php b/include/bbcode.php index 1239e5497..0415d8a73 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; @@ -994,3 +997,16 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false) return $Text; } + +/** + * This function exists as a short-term solution to folks linking to private images from their /cloud in + * their profiles, which brings up a login dialogue in the directory when that entry is viewed. + * The long term solution is to separate the web file browser from DAV so that you'll never see a + * login prompt (though the resource may return a permission denied). + */ + + + +function strip_bbimage($s) { + $Text = preg_replace("/\[[zi]mg(.*?)\](.*?)\[\/[zi]mg\]/ism", '', $Text); +} |