harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move the deleted flag setting to encode_item_flags() where it belongs now that we aren't giving deleted posts special treatment.

Browse Source
This commit is contained in:
friendica
2014-04-10 16:26:27 -07:00
parent bf1f18e172
commit a49069db4e
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/items.php
View File

@@ -842,9 +842,6 @@ function encode_item($item) {
$item['body'] = crypto_unencapsulate(json_decode_plus($item['body']),$key); $item['body'] = crypto_unencapsulate(json_decode_plus($item['body']),$key);
} }
if($item['item_restrict'] & ITEM_DELETED) {
$x['flags'] = array('deleted');
}
$x['message_id'] = $item['mid']; $x['message_id'] = $item['mid'];
$x['message_top'] = $item['parent_mid']; $x['message_top'] = $item['parent_mid'];
@@ -1029,9 +1026,11 @@ function encode_item_flags($item) {
// most of item_flags and item_restrict are local settings which don't apply when transmitted. // most of item_flags and item_restrict are local settings which don't apply when transmitted.
// We may need those for the case of syncing other hub locations which you are attached to. // We may need those for the case of syncing other hub locations which you are attached to.
// ITEM_DELETED is handled in encode_item directly so we don't need to handle it here.
$ret = array(); $ret = array();
if($item['item_restrict'] & ITEM_DELETED)
$ret[] = 'deleted';
if($item['item_flags'] & ITEM_THREAD_TOP) if($item['item_flags'] & ITEM_THREAD_TOP)
$ret[] = 'thread_parent'; $ret[] = 'thread_parent';
if($item['item_flags'] & ITEM_NSFW) if($item['item_flags'] & ITEM_NSFW)