diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-08-03 21:53:01 +0200 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-08-03 21:53:01 +0200 |
| commit | 5adb41a0edd22c7ec9519ab0cdb5c06dda7140ff (patch) | |
| tree | d3012cd1acd070372f3afb1403268c1506c8b584 /include/items.php | |
| parent | 98fa996b3f5125b60e2653bca2218b08041ad6a4 (diff) | |
| parent | db70c76494997dfda4f850b4ee63ddae2c608bde (diff) | |
| download | volse-hubzilla-5adb41a0edd22c7ec9519ab0cdb5c06dda7140ff.tar.gz volse-hubzilla-5adb41a0edd22c7ec9519ab0cdb5c06dda7140ff.tar.bz2 volse-hubzilla-5adb41a0edd22c7ec9519ab0cdb5c06dda7140ff.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/items.php')
| -rwxr-xr-x | include/items.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/items.php b/include/items.php index 5d85e875e..30cde0745 100755 --- a/include/items.php +++ b/include/items.php @@ -866,7 +866,7 @@ function get_item_elements($x) { $arr['sig'] = (($x['signature']) ? htmlspecialchars($x['signature'], ENT_COMPAT,'UTF-8',false) : ''); - $arr['diaspora_meta'] = (($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']); @@ -3765,10 +3765,9 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) { $author['owner_avatar'] = $contact['thumb']; } - if(! is_importable($datarray,$contact)) + if(! post_is_importable($datarray,$contact)) continue; - logger('consume_feed: author ' . print_r($author,true),LOGGER_DEBUG); logger('consume_feed: ' . print_r($datarray,true),LOGGER_DATA); |