diff options
| author | friendica <info@friendica.com> | 2015-01-10 13:05:02 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-10 13:05:02 -0800 |
| commit | 8c4eb839f9cf224c920e5a0c45c22961cac62ce1 (patch) | |
| tree | d14015aff61323899803c2d5a4afb99d891a3770 /include | |
| parent | c75cdbd304d493feef25ae73dbfd0b9ee39f9fd5 (diff) | |
| parent | 50bc43733febf2aaea62d0d58c9537d2c63d74ce (diff) | |
| download | volse-hubzilla-8c4eb839f9cf224c920e5a0c45c22961cac62ce1.tar.gz volse-hubzilla-8c4eb839f9cf224c920e5a0c45c22961cac62ce1.tar.bz2 volse-hubzilla-8c4eb839f9cf224c920e5a0c45c22961cac62ce1.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/conversation.php | 1 | ||||
| -rwxr-xr-x | include/items.php | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/include/conversation.php b/include/conversation.php index a2fb3d162..986892fff 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -264,6 +264,7 @@ function localize_item(&$item){ } + /* // FIXME store parent item as object or target // (and update to json storage) diff --git a/include/items.php b/include/items.php index e2534528a..e7cc15878 100755 --- a/include/items.php +++ b/include/items.php @@ -835,7 +835,9 @@ function get_item_elements($x) { if(array_key_exists('flags',$x) && in_array('deleted',$x['flags'])) - $arr['item_restrict'] = ITEM_DELETED; + $arr['item_restrict'] = ITEM_DELETED; + if(array_key_exists('flags',$x) && in_array('hidden',$x['flags'])) + $arr['item_restrict'] = ITEM_HIDDEN; // Here's the deal - the site might be down or whatever but if there's a new person you've never // seen before sending stuff to your stream, we MUST be able to look them up and import their data from their @@ -1306,6 +1308,8 @@ function encode_item_flags($item) { if($item['item_restrict'] & ITEM_DELETED) $ret[] = 'deleted'; + if($item['item_restrict'] & ITEM_HIDDEN) + $ret[] = 'hidden'; if($item['item_flags'] & ITEM_THREAD_TOP) $ret[] = 'thread_parent'; if($item['item_flags'] & ITEM_NSFW) |