From c59948f1dc25a49d37f9744f6b643968cb2134da Mon Sep 17 00:00:00 2001
From: Mike Macgirvin <mike@macgirvin.com>
Date: Thu, 9 Sep 2010 02:00:01 -0700
Subject: [PATCH] more fixes from landing

---
 include/html2bbcode.php | 4 ++--
 include/items.php       | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/include/html2bbcode.php b/include/html2bbcode.php
index 2ae0df8f68..80841375e8 100644
--- a/include/html2bbcode.php
+++ b/include/html2bbcode.php
@@ -17,8 +17,8 @@ $htmltags = array(
                         '/\<strong\>(.*?)\<\/strong\>/is',
                         '/\<a href=\"(.*?)\"(.*?)\>(.*?)\<\/a\>/is',
 			'/\<code\>(.*?)\<\/code\>/is',
-			'/\<font color=(.*?)\>(.*?)\<\/font\>',
-			'/\<font color=\"(.*?)\"\>(.*?)\<\/font\>',
+			'/\<font color=(.*?)\>(.*?)\<\/font\>/is',
+			'/\<font color=\"(.*?)\"\>(.*?)\<\/font\>/is',
 			'/\<blockquote\>(.*?)\<\/blockquote\>/is',
 
                         );
diff --git a/include/items.php b/include/items.php
index 587207abf9..a66aeff472 100644
--- a/include/items.php
+++ b/include/items.php
@@ -233,7 +233,7 @@ function get_atom_elements($item) {
 	// html.
 
 
-
+echo "test1" . $res['body'];
 	if(strpos($res['body'],'<')) {
 
 		$res['body'] = preg_replace('#<object[^>]+>.+?' . 'http://www.youtube.com/((?:v|cp)/[A-Za-z0-9\-_=]+).+?</object>#s',
@@ -249,8 +249,10 @@ function get_atom_elements($item) {
 		$purifier = new HTMLPurifier($config);
 		$res['body'] = $purifier->purify($res['body']);
 	}
+echo "test2" . $res['body'];
 	
 	$res['body'] = html2bbcode($res['body']);
+echo "test3" . $res['body'];
 
 	$allow = $item->get_item_tags(NAMESPACE_DFRN,'comment-allow');
 	if($allow && $allow[0]['data'] == 1)