From 23d1b994ccff17567391eb9b1572321b1731189c Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Mon, 31 Jan 2011 10:38:49 +0100
Subject: Move [embed] bbtag from oembed plugin to core

---
 include/bbcode.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'include/bbcode.php')

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;
-- 
cgit v1.2.3


From 49ea05b8ff27c31924ddf94c582ab4260faf56c2 Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Mon, 31 Jan 2011 16:45:58 +0100
Subject: use microformat to mark html from [embed] tag, convert html with
 oembed microformat to [embed] tag

---
 include/bbcode.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/bbcode.php')

diff --git a/include/bbcode.php b/include/bbcode.php
index c17e5dded..eb0806dc5 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -94,7 +94,7 @@ function bbcode($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);
+	$Text = oembed_bbcode2html($Text);
 
 	call_hooks('bbcode',$Text);
 
-- 
cgit v1.2.3