aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-08-11 19:24:31 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-08-11 19:24:31 -0700
commitc8b8c6cb14c3b995bcfcfb5d2f150dc599e5385a (patch)
tree57b2ffafab3308531aa4d8c8b15115e104a86dd7 /include
parent44dcbeaaa4fa58ba3bc8f535ae842089214e656f (diff)
parenteae88b081534a407ae39297b6608911112f95666 (diff)
downloadvolse-hubzilla-c8b8c6cb14c3b995bcfcfb5d2f150dc599e5385a.tar.gz
volse-hubzilla-c8b8c6cb14c3b995bcfcfb5d2f150dc599e5385a.tar.bz2
volse-hubzilla-c8b8c6cb14c3b995bcfcfb5d2f150dc599e5385a.zip
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts: include/items.php util/messages.po view/nl/messages.po view/nl/strings.php
Diffstat (limited to 'include')
-rwxr-xr-xinclude/items.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/items.php b/include/items.php
index f4bc2e876..ce4980c6a 100755
--- a/include/items.php
+++ b/include/items.php
@@ -870,6 +870,7 @@ function get_item_elements($x) {
$x['diaspora_signature'] = json_encode($x['diaspora_signature']);
$arr['diaspora_meta'] = (($x['diaspora_signature']) ? $x['diaspora_signature'] : '');
+
$arr['object'] = activity_sanitise($x['object']);
$arr['target'] = activity_sanitise($x['target']);