diff options
| author | Mario Vavti <mario@mariovavti.com> | 2019-05-13 10:39:40 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2019-05-13 10:39:40 +0200 |
| commit | d5f59a57bf2689874f2171e0c4a2354d12597f34 (patch) | |
| tree | 11b63c5dc536292e51394ddd8f42ff6bf6d129f7 /include | |
| parent | 7465c798847198238a991b302e8f6537896b9c3e (diff) | |
| download | volse-hubzilla-d5f59a57bf2689874f2171e0c4a2354d12597f34.tar.gz volse-hubzilla-d5f59a57bf2689874f2171e0c4a2354d12597f34.tar.bz2 volse-hubzilla-d5f59a57bf2689874f2171e0c4a2354d12597f34.zip | |
don't do oembed processing on naked links and smarty lib cleanup. ported from zap.
Diffstat (limited to 'include')
| -rw-r--r-- | include/bbcode.php | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/include/bbcode.php b/include/bbcode.php index 1c153677d..a675451f1 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -87,12 +87,11 @@ function nakedoembed($match) { $strip_url = strip_escaped_zids($url); - $o = oembed_fetch_url($strip_url); - - if ($o['type'] == 'error') - return str_replace($url,$strip_url,$match[0]); - - return '[embed]' . $strip_url . '[/embed]'; + // this function no longer performs oembed on naked links + // because they author may have created naked links intentionally. + // Now it just strips zids on naked links. + + return str_replace($url,$strip_url,$match[0]); } function tryzrlaudio($match) { |