diff options
| author | Thomas Willingham <founder@kakste.com> | 2012-12-18 16:59:08 +0000 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2012-12-18 16:59:08 +0000 |
| commit | d9194fdb5a6709eba8f47795dd5367d79ad0e367 (patch) | |
| tree | 86a91ec7a556310400c2eb26d45bbeb108486b36 /include/ItemObject.php | |
| parent | 2cb2896916ce98f16b891634fddcbd403c55d95f (diff) | |
| parent | e9b5b0f0b424930b87708080c4e6ce671016177b (diff) | |
| download | volse-hubzilla-d9194fdb5a6709eba8f47795dd5367d79ad0e367.tar.gz volse-hubzilla-d9194fdb5a6709eba8f47795dd5367d79ad0e367.tar.bz2 volse-hubzilla-d9194fdb5a6709eba8f47795dd5367d79ad0e367.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
view/theme/redbasic/css/style.css
Diffstat (limited to 'include/ItemObject.php')
| -rw-r--r-- | include/ItemObject.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/ItemObject.php b/include/ItemObject.php index 09f5d1298..45ea6860a 100644 --- a/include/ItemObject.php +++ b/include/ItemObject.php @@ -209,7 +209,7 @@ class Item extends BaseObject { 'type' => implode("",array_slice(explode("/",$item['verb']),-1)), 'tags' => $tags, - 'body' => template_escape($body), + 'body' => $body, 'text' => strip_tags(template_escape($body)), 'id' => $this->get_id(), 'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])), |