slight improvement in handling of plaintext feeds

diff --git a/boot.php b/boot.php
index 683daf4016cd190d7634a52f2d946abd6ec36e59..2f2e28cebde3b5a1eb574c4a1ea5eb4049e04a99 100755 (executable)
--- a/boot.php
+++ b/boot.php
@@ -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      );
 

diff --git a/include/items.php b/include/items.php
index 8f8b3ccd006520f12d44c51ec8372d9fde0f972e..ee6960534937a36bfdcbd9b2b01ec7a2b643bdad 100755 (executable)
--- a/include/items.php
+++ b/include/items.php
@@ -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)