aboutsummaryrefslogtreecommitdiffstats
path: root/include/bbcode.php
diff options
context:
space:
mode:
authorFabio Comuni <fabrix.xm@gmail.com>2011-01-31 10:38:49 +0100
committerFabio Comuni <fabrix.xm@gmail.com>2011-01-31 10:38:49 +0100
commit23d1b994ccff17567391eb9b1572321b1731189c (patch)
tree0c1ee935573bf5b152a86cfeba2372846e4f0f20 /include/bbcode.php
parentd8877b88d6c26e29019312f02297411817692361 (diff)
downloadvolse-hubzilla-23d1b994ccff17567391eb9b1572321b1731189c.tar.gz
volse-hubzilla-23d1b994ccff17567391eb9b1572321b1731189c.tar.bz2
volse-hubzilla-23d1b994ccff17567391eb9b1572321b1731189c.zip
Move [embed] bbtag from oembed plugin to core
Diffstat (limited to 'include/bbcode.php')
-rw-r--r--include/bbcode.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/bbcode.php b/include/bbcode.php
index 8382cc804..c17e5dded 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -1,5 +1,5 @@
<?php
-
+require_once("include/oembed.php");
// BBcode 2 HTML was written by WAY2WEB.net
// extended to work with Mistpark/Friendika - Mike Macgirvin
@@ -93,6 +93,9 @@ function bbcode($Text) {
$Text = preg_replace("/\[youtube\]http:\/\/www.youtube.com\/watch\?v\=(.+?)\[\/youtube\]/",'[youtube]$1[/youtube]',$Text);
$Text = preg_replace("/\[youtube\](.+?)\[\/youtube\]/", '<object width="425" height="350" type="application/x-shockwave-flash" data="http://www.youtube.com/v/$1" ><param name="movie" value="http://www.youtube.com/v/$1"></param><!--[if IE]><embed src="http://www.youtube.com/v/$1" type="application/x-shockwave-flash" width="425" height="350" /><![endif]--></object>', $Text);
+ // oembed tag
+ $Text = oembed_bbcode($Text);
+
call_hooks('bbcode',$Text);
return $Text;