diff options
| author | Friendika <info@friendika.com> | 2011-01-31 15:26:02 -0800 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-01-31 15:26:02 -0800 |
| commit | 082909fe1a861219c4f9159f8f8df5aea7546da9 (patch) | |
| tree | 1a1ed610cb668e2cbff10e95ebec1ffed19b58f9 /include/bbcode.php | |
| parent | fc20fb17c299100fd39e900f20c70d823baaebdf (diff) | |
| parent | bdbbfe17b0ab58a89a0673f5409d30870afd0b9d (diff) | |
| download | volse-hubzilla-082909fe1a861219c4f9159f8f8df5aea7546da9.tar.gz volse-hubzilla-082909fe1a861219c4f9159f8f8df5aea7546da9.tar.bz2 volse-hubzilla-082909fe1a861219c4f9159f8f8df5aea7546da9.zip | |
Merge branch 'fabrixxm-oembed'
Diffstat (limited to 'include/bbcode.php')
| -rw-r--r-- | include/bbcode.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/bbcode.php b/include/bbcode.php index 8382cc804..eb0806dc5 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_bbcode2html($Text); + call_hooks('bbcode',$Text); return $Text; |