Merge remote-tracking branch 'upstream/develop' into ap1

This commit is contained in:
Michael 2018-09-24 21:48:40 +00:00
commit 834422d52f
25 changed files with 280 additions and 141 deletions

View file

@ -157,7 +157,7 @@ class Post extends BaseObject
if ($item["event-id"] != 0) {
$edpost = ["events/event/" . $item['event-id'], L10n::t("Edit")];
} else {
$edpost = ["editpost/" . $item['id'], L10n::t("Edit")];
$edpost = ["editpost/" . $item['id'] . "/" . base64_encode($a->cmd), L10n::t("Edit")];
}
$dropping = in_array($item['uid'], [0, local_user()]);
} else {