Merge https://github.com/redmatrix/redmatrix into pending_merge

Conflicts: include/items.php util/messages.po view/nl/messages.po view/nl/strings.php
2015-08-11 19:24:31 -07:00
parent 44dcbeaaa4 eae88b0815
commit c8b8c6cb14
2 changed files with 2 additions and 1 deletions
--- 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']);