diff options
| author | Mario <mario@mariovavti.com> | 2019-05-11 15:39:31 +0200 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2019-05-11 15:39:31 +0200 |
| commit | a5cd0061c53737992bdd1938b57b0363418bd7ef (patch) | |
| tree | 6cda5ecad42212ea900b861ed9740dad277d0f3e /include | |
| parent | 630e3903fadf6de98ba9f911bb1101650d495f97 (diff) | |
| parent | d7026fe36b2febd71329e8d9512a4305ae8c05c6 (diff) | |
| download | volse-hubzilla-a5cd0061c53737992bdd1938b57b0363418bd7ef.tar.gz volse-hubzilla-a5cd0061c53737992bdd1938b57b0363418bd7ef.tar.bz2 volse-hubzilla-a5cd0061c53737992bdd1938b57b0363418bd7ef.zip | |
Merge branch 'dev' into 'dev'
use 'cache' flag to bbcode() on content destined for Zot6. We've seen rendered...
See merge request hubzilla/core!1644
Diffstat (limited to 'include')
| -rw-r--r-- | include/bbcode.php | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/include/bbcode.php b/include/bbcode.php index 36f943e46..1c153677d 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -987,11 +987,13 @@ function bbcode($Text, $options = []) { // leave open the posibility of [map=something] // this is replaced in prepare_body() which has knowledge of the item location - if (strpos($Text,'[/map]') !== false) { - $Text = preg_replace_callback("/\[map\](.*?)\[\/map\]/ism", 'bb_map_location', $Text); - } - if (strpos($Text,'[map=') !== false) { - $Text = preg_replace_callback("/\[map=(.*?)\]/ism", 'bb_map_coords', $Text); + if (! $cache) { + if (strpos($Text,'[/map]') !== false) { + $Text = preg_replace_callback("/\[map\](.*?)\[\/map\]/ism", 'bb_map_location', $Text); + } + if (strpos($Text,'[map=') !== false) { + $Text = preg_replace_callback("/\[map=(.*?)\]/ism", 'bb_map_coords', $Text); + } } if (strpos($Text,'[map]') !== false) { $Text = preg_replace("/\[map\]/", '<div class="map"></div>', $Text); |