Merge branch '0.9.x' into socialbookmark

This commit is contained in:
Evan Prodromou 2010-12-28 13:42:44 -08:00
commit a2000f889a

View File

@ -109,6 +109,11 @@ class Notice extends Memcached_DataObject
// @fixme we have some cases where things get re-run and so the // @fixme we have some cases where things get re-run and so the
// insert fails. // insert fails.
$deleted = Deleted_notice::staticGet('id', $this->id); $deleted = Deleted_notice::staticGet('id', $this->id);
if (!$deleted) {
$deleted = Deleted_notice::staticGet('uri', $this->uri);
}
if (!$deleted) { if (!$deleted) {
$deleted = new Deleted_notice(); $deleted = new Deleted_notice();