From: Brion Vibber <brion@pobox.com>
Date: Mon, 24 May 2010 14:47:15 +0000 (-0700)
Subject: Handle funky notice deletion cases more gracefully: if we already have a deleted_noti... 
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f7add6f25f37780fde2269b254c237caea9ef98d;p=quix0rs-gnu-social.git

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.
---

diff --git a/classes/Notice.php b/classes/Notice.php
index e173a24690..d85c8cd33a 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -97,15 +97,20 @@ class Notice extends Memcached_DataObject
         // For auditing purposes, save a record that the notice
         // was deleted.
 
-        $deleted = new Deleted_notice();
+        // @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->id         = $this->id;
-        $deleted->profile_id = $this->profile_id;
-        $deleted->uri        = $this->uri;
-        $deleted->created    = $this->created;
-        $deleted->deleted    = common_sql_now();
+            $deleted->id         = $this->id;
+            $deleted->profile_id = $this->profile_id;
+            $deleted->uri        = $this->uri;
+            $deleted->created    = $this->created;
+            $deleted->deleted    = common_sql_now();
 
-        $deleted->insert();
+            $deleted->insert();
+        }
 
         // Clear related records