diff options
| author | Michael Vogel <icarus@dabo.de> | 2012-04-02 22:00:22 +0200 |
|---|---|---|
| committer | Michael Vogel <icarus@dabo.de> | 2012-04-02 22:00:22 +0200 |
| commit | 3dc317dcc62c8e982d964bcae421a1410771d51c (patch) | |
| tree | 6e63f4e263a6637656ed24dfb5c36292d442c268 /include/items.php | |
| parent | a39d8d3f02e5bbd711fde71594c2c787b21ef2e9 (diff) | |
| parent | 6dfd55668f39d2cfb27d468cc982471abaad5165 (diff) | |
| download | volse-hubzilla-3dc317dcc62c8e982d964bcae421a1410771d51c.tar.gz volse-hubzilla-3dc317dcc62c8e982d964bcae421a1410771d51c.tar.bz2 volse-hubzilla-3dc317dcc62c8e982d964bcae421a1410771d51c.zip | |
Merge commit 'upstream/master'
Diffstat (limited to 'include/items.php')
| -rwxr-xr-x | include/items.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/items.php b/include/items.php index e09b888ca..ee6960534 100755 --- a/include/items.php +++ b/include/items.php @@ -435,8 +435,15 @@ function get_atom_elements($feed,$item) { $res['body'] = @html2bbcode($res['body']); } - else + 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) |