jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix for vanishing notes (#5531)

Browse source 
* Fix for vanishing notes

* The field needs to be part of the selected fields ...
This commit is contained in:
Michael Vogel 2018-07-31 04:23:48 +02:00 committed by Hypolite Petovan
parent 4d39164c1e
commit c39e0dcf2a
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mod/notes.php
View file

@ -59,7 +59,7 @@ function notes_content(App $a, $update = false)
}
$condition = ['uid' => local_user(), 'post-type' => Item::PT_PERSONAL_NOTE, 'gravity' => GRAVITY_PARENT,
'wall' => false, 'allow_cid' => '<' . $a->contact['id'] . '>', 'contact-id'=> $a->contact['id']];
'wall' => false, 'contact-id'=> $a->contact['id']];
$a->set_pager_itemspage(40);

6
src/Model/Item.php
View file

@ -2855,7 +2855,7 @@ class Item extends BaseObject
$condition[] = $days;
}
$items = self::select(['file', 'resource-id', 'starred', 'type', 'id'], $condition);
$items = self::select(['file', 'resource-id', 'starred', 'type', 'id', 'post-type'], $condition);
if (!DBA::isResult($items)) {
return;
@ -2887,9 +2887,9 @@ class Item extends BaseObject
continue;
} elseif (!$expire_starred && intval($item['starred'])) {
continue;
} elseif (!$expire_notes && $item['type'] == 'note') {
} elseif (!$expire_notes && (($item['type'] == 'note') || ($item['post-type'] == Item::PT_PERSONAL_NOTE))) {
continue;
} elseif (!$expire_items && $item['type'] != 'note') {
} elseif (!$expire_items && ($item['type'] != 'note') && ($item['post-type'] != Item::PT_PERSONAL_NOTE)) {
continue;
}