friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

slight improvement in handling of plaintext feeds

This commit is contained in:
friendica 2012-04-01 15:43:57 -07:00
parent 9b4bef8ac4
commit 00bbb9ad36
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '2.3.1298' );
define ( 'FRIENDICA_VERSION', '2.3.1299' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1134 );

11
include/items.php
View File

@ -435,8 +435,15 @@ function get_atom_elements($feed,$item) {
$res['body'] = @html2bbcode($res['body']);
}
// else
// $res['body'] = escape_tags($res['body']);
elseif(! $have_real_body) {
// it's not one of our messages and it has no tags
// so it's probably just text. We'll escape it just to be safe.
$res['body'] = escape_tags($res['body']);
}
// this tag is obsolete but we keep it for really old sites
$allow = $item->get_item_tags(NAMESPACE_DFRN,'comment-allow');
if($allow && $allow[0]['data'] == 1)