Merge pull request #6160 from annando/item-delete

Allow to delete every post, even public ones
This commit is contained in:
Hypolite Petovan 2018-11-17 19:27:12 -05:00 committed by GitHub
commit 2456a66597
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -157,11 +157,13 @@ class Post extends BaseObject
$shareable = in_array($conv->getProfileOwner(), [0, local_user()]) && $item['private'] != 1;
if (local_user() && Strings::compareLink($a->contact['url'], $item['author-link'])) {
if ($item["event-id"] != 0) {
$edpost = ["events/event/" . $item['event-id'], L10n::t("Edit")];
} else {
$edpost = ["editpost/" . $item['id'], L10n::t("Edit")];
if (local_user()) {
if (Strings::compareLink($a->contact['url'], $item['author-link'])) {
if ($item["event-id"] != 0) {
$edpost = ["events/event/" . $item['event-id'], L10n::t("Edit")];
} else {
$edpost = ["editpost/" . $item['id'], L10n::t("Edit")];
}
}
$dropping = in_array($item['uid'], [0, local_user()]);
} else {
@ -205,7 +207,7 @@ class Post extends BaseObject
'delete' => $delete,
];
if (!local_user() || ($item['uid'] == 0)) {
if (!local_user()) {
$drop = false;
}