Merge branch 'friendika-master'

[friendica.git] / include / bbcode.php

diff --git a/include/bbcode.php b/include/bbcode.php
index 8382cc80441f5e73dff5cd6a9d9b801a93a6599d..eb0806dc527fee8b6b36a89d6d6239e807ca665e 100644 (file)
--- 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;