nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

more fixes from landing

Browse source
This commit is contained in:
Mike Macgirvin 2010-09-09 02:00:01 -07:00
parent bc9e175ced
commit c59948f1dc
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/html2bbcode.php
View file

@ -17,8 +17,8 @@ $htmltags = array(
'/\<strong\>(.*?)\<\/strong\>/is', '/\<strong\>(.*?)\<\/strong\>/is',
'/\<a href=\"(.*?)\"(.*?)\>(.*?)\<\/a\>/is', '/\<a href=\"(.*?)\"(.*?)\>(.*?)\<\/a\>/is',
'/\<code\>(.*?)\<\/code\>/is', '/\<code\>(.*?)\<\/code\>/is',
'/\<font color=(.*?)\>(.*?)\<\/font\>', '/\<font color=(.*?)\>(.*?)\<\/font\>/is',
'/\<font color=\"(.*?)\"\>(.*?)\<\/font\>', '/\<font color=\"(.*?)\"\>(.*?)\<\/font\>/is',
'/\<blockquote\>(.*?)\<\/blockquote\>/is', '/\<blockquote\>(.*?)\<\/blockquote\>/is',
); );

4
include/items.php
View file

@ -233,7 +233,7 @@ function get_atom_elements($item) {
// html. // html.
echo "test1" . $res['body'];
if(strpos($res['body'],'<')) { if(strpos($res['body'],'<')) {
$res['body'] = preg_replace('#<object[^>]+>.+?' . 'http://www.youtube.com/((?:v|cp)/[A-Za-z0-9\-_=]+).+?</object>#s', $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); $purifier = new HTMLPurifier($config);
$res['body'] = $purifier->purify($res['body']); $res['body'] = $purifier->purify($res['body']);
} }
echo "test2" . $res['body'];
$res['body'] = html2bbcode($res['body']); $res['body'] = html2bbcode($res['body']);
echo "test3" . $res['body'];
$allow = $item->get_item_tags(NAMESPACE_DFRN,'comment-allow'); $allow = $item->get_item_tags(NAMESPACE_DFRN,'comment-allow');
if($allow && $allow[0]['data'] == 1) if($allow && $allow[0]['data'] == 1)