diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-08-11 19:24:31 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-08-11 19:24:31 -0700 |
| commit | c8b8c6cb14c3b995bcfcfb5d2f150dc599e5385a (patch) | |
| tree | 57b2ffafab3308531aa4d8c8b15115e104a86dd7 | |
| parent | 44dcbeaaa4fa58ba3bc8f535ae842089214e656f (diff) | |
| parent | eae88b081534a407ae39297b6608911112f95666 (diff) | |
| download | volse-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
| -rwxr-xr-x | include/items.php | 1 | ||||
| -rw-r--r-- | version.inc | 2 |
2 files changed, 2 insertions, 1 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']); diff --git a/version.inc b/version.inc index a898bfc30..699013c51 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-08-06.1116 +2015-08-08.1118 |