forked from GNUsocial/gnu-social
Handle funky notice deletion cases more gracefully: if we already have a deleted_notice entry, don't freak out when we try to save it again on the second try.
This commit is contained in:
parent
dc22ed8480
commit
f7add6f25f
@ -97,6 +97,10 @@ class Notice extends Memcached_DataObject
|
|||||||
// For auditing purposes, save a record that the notice
|
// For auditing purposes, save a record that the notice
|
||||||
// was deleted.
|
// was deleted.
|
||||||
|
|
||||||
|
// @fixme we have some cases where things get re-run and so the
|
||||||
|
// insert fails.
|
||||||
|
$deleted = Deleted_notice::staticGet('id', $this->id);
|
||||||
|
if (!$deleted) {
|
||||||
$deleted = new Deleted_notice();
|
$deleted = new Deleted_notice();
|
||||||
|
|
||||||
$deleted->id = $this->id;
|
$deleted->id = $this->id;
|
||||||
@ -106,6 +110,7 @@ class Notice extends Memcached_DataObject
|
|||||||
$deleted->deleted = common_sql_now();
|
$deleted->deleted = common_sql_now();
|
||||||
|
|
||||||
$deleted->insert();
|
$deleted->insert();
|
||||||
|
}
|
||||||
|
|
||||||
// Clear related records
|
// Clear related records
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user