diff options
| author | jeroenpraat <jeroenpraat@xs4all.nl> | 2016-12-19 16:52:17 +0100 |
|---|---|---|
| committer | jeroenpraat <jeroenpraat@xs4all.nl> | 2016-12-19 16:52:17 +0100 |
| commit | 468fb3c77a60fe38a021502bce5ca6a4e4c211a4 (patch) | |
| tree | 0a6c99558d6815157a41d46ae8e50ecb0899e527 /include/bbcode.php | |
| parent | 3a4bd27333a90191868393f747fad662a51753f0 (diff) | |
| parent | 3ad3d3037f8ba9643952bbf64e70c5edf302a73b (diff) | |
| download | volse-hubzilla-468fb3c77a60fe38a021502bce5ca6a4e4c211a4.tar.gz volse-hubzilla-468fb3c77a60fe38a021502bce5ca6a4e4c211a4.tar.bz2 volse-hubzilla-468fb3c77a60fe38a021502bce5ca6a4e4c211a4.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
Diffstat (limited to 'include/bbcode.php')
| -rw-r--r-- | include/bbcode.php | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/include/bbcode.php b/include/bbcode.php index b315255f5..32354aeda 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -1067,15 +1067,15 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false) $Text = preg_replace("/\[zaudio\](.*?)\[\/zaudio\]/", '<a class="zid" href="$1" target="_blank" >$1</a>', $Text); } - if ($tryoembed){ - if (strpos($Text,'[/iframe]') !== false) { - $Text = preg_replace_callback("/\[iframe\](.*?)\[\/iframe\]/ism", 'bb_iframe', $Text); - } - } else { - if (strpos($Text,'[/iframe]') !== false) { - $Text = preg_replace("/\[iframe\](.*?)\[\/iframe\]/ism", '<a href="$1" target="_blank" >$1</a>', $Text); - } - } +// if ($tryoembed){ +// if (strpos($Text,'[/iframe]') !== false) { +// $Text = preg_replace_callback("/\[iframe\](.*?)\[\/iframe\]/ism", 'bb_iframe', $Text); +// } +// } else { +// if (strpos($Text,'[/iframe]') !== false) { +// $Text = preg_replace("/\[iframe\](.*?)\[\/iframe\]/ism", '<a href="$1" target="_blank" >$1</a>', $Text); +// } +// } // oembed tag $Text = oembed_bbcode2html($Text); |