Merge branch '0.9.x' into socialbookmark

2010-12-28 13:42:44 -08:00 · 2010-12-28 13:42:44 -08:00 · a2000f889a
commit a2000f889a
parent 821770966b 320e73a321
1 changed files with 5 additions and 0 deletions
--- a/classes/Notice.php
+++ b/classes/Notice.php
@ -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();