Show "Remove from your screen" or "delete" depending of the impact of the deletion
This commit is contained in:
parent
e77cd17495
commit
c9f55f6b3d
|
@ -433,7 +433,6 @@ These Fields are not added below (yet). They are here to for bug search.
|
||||||
`item`.`bookmark`,
|
`item`.`bookmark`,
|
||||||
`item`.`unseen`,
|
`item`.`unseen`,
|
||||||
`item`.`deleted`,
|
`item`.`deleted`,
|
||||||
`item`.`origin`,
|
|
||||||
`item`.`forum_mode`,
|
`item`.`forum_mode`,
|
||||||
`item`.`mention`,
|
`item`.`mention`,
|
||||||
`item`.`global`,
|
`item`.`global`,
|
||||||
|
@ -446,7 +445,7 @@ These Fields are not added below (yet). They are here to for bug search.
|
||||||
`item`.`uri`, `item`.`thr-parent`, `item`.`parent-uri`, `item`.`content-warning`,
|
`item`.`uri`, `item`.`thr-parent`, `item`.`parent-uri`, `item`.`content-warning`,
|
||||||
`item`.`commented`, `item`.`created`, `item`.`edited`, `item`.`received`,
|
`item`.`commented`, `item`.`created`, `item`.`edited`, `item`.`received`,
|
||||||
`item`.`verb`, `item`.`object-type`, `item`.`postopts`, `item`.`plink`,
|
`item`.`verb`, `item`.`object-type`, `item`.`postopts`, `item`.`plink`,
|
||||||
`item`.`guid`, `item`.`wall`, `item`.`private`, `item`.`starred`,
|
`item`.`guid`, `item`.`wall`, `item`.`private`, `item`.`starred`, `item`.`origin`,
|
||||||
`item`.`title`, `item`.`body`, `item`.`file`, `item`.`event-id`,
|
`item`.`title`, `item`.`body`, `item`.`file`, `item`.`event-id`,
|
||||||
`item`.`location`, `item`.`coord`, `item`.`app`, `item`.`attach`,
|
`item`.`location`, `item`.`coord`, `item`.`app`, `item`.`attach`,
|
||||||
`item`.`rendered-hash`, `item`.`rendered-html`, `item`.`object`,
|
`item`.`rendered-hash`, `item`.`rendered-html`, `item`.`object`,
|
||||||
|
|
|
@ -172,13 +172,31 @@ class Post extends BaseObject
|
||||||
$dropping = true;
|
$dropping = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$origin = $item['origin'];
|
||||||
|
|
||||||
|
if (!$origin) {
|
||||||
|
/// @todo This shouldn't be done as query here, but better during the data creation.
|
||||||
|
// it is now done here, since during the RC phase we shouldn't make to intense changes.
|
||||||
|
$parent = dba::selectFirst('item', ['origin'], ['id' => $item['parent']]);
|
||||||
|
if (DBM::is_result($parent)) {
|
||||||
|
$origin = $parent['origin'];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Showing the one or the other text, depending upon if we can only hide it or really delete it.
|
||||||
|
$delete = $origin ? L10n::t('Delete') : L10n::t('Remove from your stream');
|
||||||
|
|
||||||
$drop = [
|
$drop = [
|
||||||
'dropping' => $dropping,
|
'dropping' => $dropping,
|
||||||
'pagedrop' => ((Feature::isEnabled($conv->getProfileOwner(), 'multi_delete')) ? $item['pagedrop'] : ''),
|
'pagedrop' => ((Feature::isEnabled($conv->getProfileOwner(), 'multi_delete')) ? $item['pagedrop'] : ''),
|
||||||
'select' => L10n::t('Select'),
|
'select' => L10n::t('Select'),
|
||||||
'delete' => L10n::t('Remove from your stream'),
|
'delete' => $delete,
|
||||||
];
|
];
|
||||||
|
|
||||||
|
if (!local_user()) {
|
||||||
|
$drop = false;
|
||||||
|
}
|
||||||
|
|
||||||
$filer = (($conv->getProfileOwner() == local_user() && ($item['uid'] != 0)) ? L10n::t("save to folder") : false);
|
$filer = (($conv->getProfileOwner() == local_user() && ($item['uid'] != 0)) ? L10n::t("save to folder") : false);
|
||||||
|
|
||||||
$diff_author = !link_compare($item['url'], $item['author-link']);
|
$diff_author = !link_compare($item['url'], $item['author-link']);
|
||||||
|
|
Loading…
Reference in a new issue