more fixes from landing

diff --git a/include/html2bbcode.php b/include/html2bbcode.php
index 2ae0df8f688123077eca1b070b2ae749247de254..80841375e8ed28294e7012e5f00d20195e1a33ba 100644 (file)
--- 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 587207abf9fa4cab4cba550312b5e997a569ab82..a66aeff4729546a3bbf5a9794ae0b6e72a80abdd 100644 (file)
--- 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)