diff options
| author | Mike Macgirvin <mike@macgirvin.com> | 2010-09-09 02:00:01 -0700 |
|---|---|---|
| committer | Mike Macgirvin <mike@macgirvin.com> | 2010-09-09 02:00:01 -0700 |
| commit | c59948f1dc25a49d37f9744f6b643968cb2134da (patch) | |
| tree | c345bfcc9aac2a77a832deef7105d772ae76dd71 /include | |
| parent | bc9e175ced0c7a0b4f51456c9ab3ffb8bf89dd4d (diff) | |
| download | volse-hubzilla-c59948f1dc25a49d37f9744f6b643968cb2134da.tar.gz volse-hubzilla-c59948f1dc25a49d37f9744f6b643968cb2134da.tar.bz2 volse-hubzilla-c59948f1dc25a49d37f9744f6b643968cb2134da.zip | |
more fixes from landing
Diffstat (limited to 'include')
| -rw-r--r-- | include/html2bbcode.php | 4 | ||||
| -rw-r--r-- | include/items.php | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/include/html2bbcode.php b/include/html2bbcode.php index 2ae0df8f6..80841375e 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 587207abf..a66aeff47 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) |