]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.9.x' into socialbookmark
authorEvan Prodromou <evan@status.net>
Tue, 28 Dec 2010 21:42:44 +0000 (13:42 -0800)
committerEvan Prodromou <evan@status.net>
Tue, 28 Dec 2010 21:42:44 +0000 (13:42 -0800)
classes/Notice.php

index 14fffe69763213bd63f47bf3246a0855a745e2f0..0e8bd3c691f9126174300ed8af6b1d26385ad601 100644 (file)
@@ -109,6 +109,11 @@ class Notice extends Memcached_DataObject
         // @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 = Deleted_notice::staticGet('uri', $this->uri);
+        }
+
         if (!$deleted) {
             $deleted = new Deleted_notice();