diff options
author | Mario Vavti <mario@mariovavti.com> | 2018-04-27 09:54:36 +0200 |
---|---|---|
committer | Mario Vavti <mario@mariovavti.com> | 2018-04-27 09:54:36 +0200 |
commit | 2e9738e20458c6bd1fa1b71f32896c09accd486d (patch) | |
tree | f9cad3c58e5c2851ce9e4e32a0a0686155d82bde /include/bbcode.php | |
parent | 00a95f4b91711cc28c9b170cfdc8ea6626d803a6 (diff) | |
parent | 7b445a5b39b887135854ba1b9aa6d9867d584ae5 (diff) | |
download | volse-hubzilla-2e9738e20458c6bd1fa1b71f32896c09accd486d.tar.gz volse-hubzilla-2e9738e20458c6bd1fa1b71f32896c09accd486d.tar.bz2 volse-hubzilla-2e9738e20458c6bd1fa1b71f32896c09accd486d.zip |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'include/bbcode.php')
-rw-r--r-- | include/bbcode.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/bbcode.php b/include/bbcode.php index 340fe6b25..345b5b025 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -85,12 +85,14 @@ function tryoembed($match) { function nakedoembed($match) { $url = ((count($match) == 2) ? $match[1] : $match[2]); - $o = oembed_fetch_url($url); + $strip_url = strip_escaped_zids($url); + + $o = oembed_fetch_url($strip_url); if ($o['type'] == 'error') - return $match[0]; + return str_replace($url,$strip_url,$match[0]); - return '[embed]' . $url . '[/embed]'; + return '[embed]' . $strip_url . '[/embed]'; } function tryzrlaudio($match) { |